|
@@ -10,10 +10,10 @@
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
<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$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war.xml" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.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$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/props/config_test.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/props/config_test.properties" afterDir="false" />
|
|
|
</list>
|
|
</list>
|
|
|
<list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
|
|
<list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -91,17 +91,6 @@
|
|
|
</key>
|
|
</key>
|
|
|
</component>
|
|
</component>
|
|
|
<component name="RunManager">
|
|
<component name="RunManager">
|
|
|
- <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
|
|
|
|
|
- <option name="arquillianRunConfiguration">
|
|
|
|
|
- <value>
|
|
|
|
|
- <option name="containerStateName" value="" />
|
|
|
|
|
- </value>
|
|
|
|
|
- </option>
|
|
|
|
|
- <option name="TEST_OBJECT" value="class" />
|
|
|
|
|
- <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">
|
|
<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="OPEN_IN_BROWSER" value="false" />
|
|
|
<option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation="local" -Djdbc.worker.id="1001"" />
|
|
<option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation="local" -Djdbc.worker.id="1001"" />
|
|
@@ -234,7 +223,8 @@
|
|
|
<workItem from="1630656368650" duration="64000" />
|
|
<workItem from="1630656368650" duration="64000" />
|
|
|
<workItem from="1630656901862" duration="33000" />
|
|
<workItem from="1630656901862" duration="33000" />
|
|
|
<workItem from="1630888067668" duration="852000" />
|
|
<workItem from="1630888067668" duration="852000" />
|
|
|
- <workItem from="1630893291690" duration="11480000" />
|
|
|
|
|
|
|
+ <workItem from="1630893291690" duration="11740000" />
|
|
|
|
|
+ <workItem from="1630976664603" duration="3578000" />
|
|
|
</task>
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修改客户跟进列表">
|
|
<task id="LOCAL-00001" summary="修改客户跟进列表">
|
|
|
<created>1630486551669</created>
|
|
<created>1630486551669</created>
|
|
@@ -341,7 +331,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1630919726185</updated>
|
|
<updated>1630919726185</updated>
|
|
|
</task>
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="16" />
|
|
|
|
|
|
|
+ <task id="LOCAL-00016" summary="客户资料维护修改">
|
|
|
|
|
+ <created>1630920690177</created>
|
|
|
|
|
+ <option name="number" value="00016" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00016" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1630920690177</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <option name="localTasksCounter" value="17" />
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|