|
|
@@ -2,79 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/common/model/UserLoginLog.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/mall/view/goods_cate/second.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/mall/view/goods_cate/third.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Alipay.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Alipay.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Demand.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Es.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Es.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/api/controller/Qc.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Qc.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recruit.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Report.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Report.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" 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/api/controller/Trolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Trolley.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/WeChatPay.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/WeChatPay.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/DatumIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/DatumIntro.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/GoodsOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/GoodsOrder.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/GoodsOrderItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/GoodsOrderItem.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/ShoppingTrolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ShoppingTrolley.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/StoreGoodsItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/StoreGoodsItem.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/TopSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/TopSearch.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/UserFacility.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserFacility.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/UserMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserMessage.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/model/UserSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserSearch.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/service/CheckPower.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/CheckPower.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/service/Elastic.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/Elastic.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/service/OrderCallback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/OrderCallback.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/service/UserSynth.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/UserSynth.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/controller/Banner.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/Banner.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/controller/GoodsCate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/GoodsCate.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/view/banner/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/banner/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/view/goods_cate/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/goods_cate/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/view/goods_cate/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/goods_cate/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" 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/controller/SeriesArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesArticle.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/controller/UserArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/UserArticle.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/datum_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/user_article/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/user_article/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/user_datum/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/user_datum/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/user_video/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/user_video/index.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/ActivityApplyItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityApplyItem.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/recruit/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/recruit/index.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" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -487,7 +416,7 @@
|
|
|
<workItem from="1693874624473" duration="24108000" />
|
|
|
<workItem from="1693961752874" duration="17119000" />
|
|
|
<workItem from="1694048197092" duration="22485000" />
|
|
|
- <workItem from="1694134843963" duration="9152000" />
|
|
|
+ <workItem from="1694134843963" duration="10096000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
