|
|
@@ -10,14 +10,8 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户信息主营产品修改日志排序修改">
|
|
|
+ <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 id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
|
|
|
@@ -96,6 +90,19 @@
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunManager">
|
|
|
+ <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
|
|
|
+ <option name="arquillianRunConfiguration">
|
|
|
+ <value>
|
|
|
+ <option name="containerStateName" value="" />
|
|
|
+ </value>
|
|
|
+ </option>
|
|
|
+ <option name="TEST_OBJECT" value="CLASS" />
|
|
|
+ <properties />
|
|
|
+ <listeners />
|
|
|
+ <method v="2">
|
|
|
+ <option name="Make" enabled="true" />
|
|
|
+ </method>
|
|
|
+ </configuration>
|
|
|
<configuration name="Tomcat 8.5.59" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.59" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
|
|
|
<option name="OPEN_IN_BROWSER" value="false" />
|
|
|
<option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation="local" -Djdbc.worker.id="1001"" />
|
|
|
@@ -232,7 +239,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="5075000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修改客户跟进列表">
|
|
|
<created>1630486551669</created>
|
|
|
@@ -451,7 +458,21 @@
|
|
|
<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>
|
|
|
+ <task id="LOCAL-00033" summary="客户中间表关联接口修改">
|
|
|
+ <created>1631156524682</created>
|
|
|
+ <option name="number" value="00033" />
|
|
|
+ <option name="presentableId" value="LOCAL-00033" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1631156524682</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="34" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
@@ -497,7 +518,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">
|
|
|
@@ -505,7 +527,7 @@
|
|
|
<breakpoints>
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java</url>
|
|
|
- <line>1073</line>
|
|
|
+ <line>1077</line>
|
|
|
<option name="timeStamp" value="4" />
|
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|