|
|
@@ -10,16 +10,7 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" 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$/src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/dao/UserMidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/dao/UserMidMapper.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMidMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java" afterDir="false" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户中间表关联接口修改" />
|
|
|
<list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -232,7 +223,7 @@
|
|
|
<workItem from="1630893291690" duration="11740000" />
|
|
|
<workItem from="1630976664603" duration="14614000" />
|
|
|
<workItem from="1631062478856" duration="20529000" />
|
|
|
- <workItem from="1631149669077" duration="4198000" />
|
|
|
+ <workItem from="1631149669077" duration="4518000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修改客户跟进列表">
|
|
|
<created>1630486551669</created>
|
|
|
@@ -451,7 +442,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1631099545002</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="32" />
|
|
|
+ <task id="LOCAL-00032" summary="客户中间表关联接口修改">
|
|
|
+ <created>1631156464553</created>
|
|
|
+ <option name="number" value="00032" />
|
|
|
+ <option name="presentableId" value="LOCAL-00032" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1631156464553</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="33" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
@@ -497,7 +495,8 @@
|
|
|
<MESSAGE value="处理相同的修改" />
|
|
|
<MESSAGE value="导出修改" />
|
|
|
<MESSAGE value="客户信息主营产品修改日志排序修改" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="客户信息主营产品修改日志排序修改" />
|
|
|
+ <MESSAGE value="客户中间表关联接口修改" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="客户中间表关联接口修改" />
|
|
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|