|
@@ -4,13 +4,34 @@
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/api/controller/Task.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Task.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/nutrition/controller/DatumUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/DatumUrl.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/cache/4c/d9aaff68a897261d9d4e25ac10435f.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/cache/4c/d9aaff68a897261d9d4e25ac10435f.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Forum.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Press.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Recruit.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/activity/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/forum/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/forum/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/platform_demand/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/platform_demand/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/press/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/press/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/recruit/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/recruit/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/log/single_error.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_error.log" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/runtime/log/single_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/temp/1b6a1644117c90071fb31852925a1ccc.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/1b6a1644117c90071fb31852925a1ccc.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/temp/fd196fc52d16d9eb4ade21e166aebae4.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/fd196fc52d16d9eb4ade21e166aebae4.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/0580a33d5da846fead7e0fa2f3a91ef8.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/0580a33d5da846fead7e0fa2f3a91ef8.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/1be237e4f24b1edd1b79f38d10cd3991.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/1be237e4f24b1edd1b79f38d10cd3991.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/1d7fe2216b1edaff8c774efa7a9be1cb.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/1d7fe2216b1edaff8c774efa7a9be1cb.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/3a2fc529b781103baceb9d9b660602e9.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/3a2fc529b781103baceb9d9b660602e9.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/513f1b02bf5ffe026233d4f743e74e13.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/513f1b02bf5ffe026233d4f743e74e13.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/9462ddc27b654c9118a3a61ae55e92df.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/9462ddc27b654c9118a3a61ae55e92df.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/acc9de5bdb54001d5659c253ab36c3bf.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/acc9de5bdb54001d5659c253ab36c3bf.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/temp/b2fe1787c7d5136fc070e9ea01519a2e.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/temp/b2fe1787c7d5136fc070e9ea01519a2e.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -579,7 +600,7 @@
|
|
|
<workItem from="1710896140284" duration="18662000" />
|
|
|
<workItem from="1710981036861" duration="23494000" />
|
|
|
<workItem from="1711067530545" duration="23609000" />
|
|
|
- <workItem from="1711326936846" duration="11332000" />
|
|
|
+ <workItem from="1711326936846" duration="19841000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -713,10 +734,10 @@
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
<state x="827" y="411" key="NewPhpClassDialog/0.0.2194.1194@0.0.2194.1194" timestamp="1710897647768" />
|
|
|
- <state x="310" y="130" width="1206" height="901" key="find.popup" timestamp="1711096263470">
|
|
|
+ <state x="310" y="130" width="1206" height="901" key="find.popup" timestamp="1711347604856">
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="310" y="130" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1711096263470" />
|
|
|
+ <state x="310" y="130" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1711347604856" />
|
|
|
<state x="1355" y="482" width="672" height="579" key="search.everywhere.popup" timestamp="1711334554152">
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
@@ -737,7 +758,7 @@
|
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="javascript">
|
|
|
<url>file://$PROJECT_DIR$/application/operate/view/activity/form.html</url>
|
|
|
- <line>686</line>
|
|
|
+ <line>699</line>
|
|
|
<option name="timeStamp" value="8" />
|
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="php-line-method">
|