|
@@ -1,10 +1,11 @@
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
- <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1、补充员工字段;">
|
|
|
|
|
|
+ <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1、活跃用户列表排除内部员工;">
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/dataSources/7d802c84-b2d0-49d9-a044-ab91ef765055.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7d802c84-b2d0-49d9-a044-ab91ef765055.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/app/controller/home/statistic.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/statistic.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/controller/home/products.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/controller/home/products.js" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/routers/home/shop.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/routers/home/shop.js" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -274,14 +275,8 @@
|
|
<workItem from="1693448014632" duration="596000" />
|
|
<workItem from="1693448014632" duration="596000" />
|
|
<workItem from="1693618204645" duration="54000" />
|
|
<workItem from="1693618204645" duration="54000" />
|
|
<workItem from="1693965606793" duration="9192000" />
|
|
<workItem from="1693965606793" duration="9192000" />
|
|
- <workItem from="1694742935995" duration="13550000" />
|
|
|
|
- </task>
|
|
|
|
- <task id="LOCAL-00031" summary="1.订单打印补充商品信息;">
|
|
|
|
- <created>1673075312104</created>
|
|
|
|
- <option name="number" value="00031" />
|
|
|
|
- <option name="presentableId" value="LOCAL-00031" />
|
|
|
|
- <option name="project" value="LOCAL" />
|
|
|
|
- <updated>1673075312104</updated>
|
|
|
|
|
|
+ <workItem from="1694742935995" duration="13888000" />
|
|
|
|
+ <workItem from="1695004502767" duration="17969000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00032" summary="1.修复下单付款没有扣除库存的问题;">
|
|
<task id="LOCAL-00032" summary="1.修复下单付款没有扣除库存的问题;">
|
|
<created>1673230889699</created>
|
|
<created>1673230889699</created>
|
|
@@ -619,7 +614,14 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1694764819840</updated>
|
|
<updated>1694764819840</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="80" />
|
|
|
|
|
|
+ <task id="LOCAL-00080" summary="1、活跃用户列表排除内部员工;">
|
|
|
|
+ <created>1694768534259</created>
|
|
|
|
+ <option name="number" value="00080" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00080" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1694768534260</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="81" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -665,7 +667,6 @@
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<component name="VcsManagerConfiguration">
|
|
- <MESSAGE value="1.补充限制付款订单才能分发电子餐费;" />
|
|
|
|
<MESSAGE value="1.调整限制兑酒红包的使用;" />
|
|
<MESSAGE value="1.调整限制兑酒红包的使用;" />
|
|
<MESSAGE value="1.调整餐店分佣比例;" />
|
|
<MESSAGE value="1.调整餐店分佣比例;" />
|
|
<MESSAGE value="1.修复电子餐费发放失败的bug;" />
|
|
<MESSAGE value="1.修复电子餐费发放失败的bug;" />
|
|
@@ -690,7 +691,8 @@
|
|
<MESSAGE value="1、关联查询排序问题;" />
|
|
<MESSAGE value="1、关联查询排序问题;" />
|
|
<MESSAGE value="1、热卖-新品-销量-库存 排序;" />
|
|
<MESSAGE value="1、热卖-新品-销量-库存 排序;" />
|
|
<MESSAGE value="1、补充员工字段;" />
|
|
<MESSAGE value="1、补充员工字段;" />
|
|
- <option name="LAST_COMMIT_MESSAGE" value="1、补充员工字段;" />
|
|
|
|
|
|
+ <MESSAGE value="1、活跃用户列表排除内部员工;" />
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="1、活跃用户列表排除内部员工;" />
|
|
</component>
|
|
</component>
|
|
<component name="XDebuggerManager">
|
|
<component name="XDebuggerManager">
|
|
<breakpoint-manager>
|
|
<breakpoint-manager>
|