|
|
@@ -9,7 +9,11 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、修改修改客户信息接口 2、开发客户资料列表 3、开发客户资料日志列表" />
|
|
|
+ <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、修改修改客户信息接口 2、开发客户资料列表 3、开发客户资料日志列表">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/kede-server.iml" beforeDir="false" afterPath="$PROJECT_DIR$/kede-server.iml" afterDir="false" />
|
|
|
+ </list>
|
|
|
<list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -23,6 +27,9 @@
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+ <component name="Git.Merge.Settings">
|
|
|
+ <option name="BRANCH" value="master" />
|
|
|
+ </component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
|
<map>
|
|
|
@@ -48,10 +55,8 @@
|
|
|
</component>
|
|
|
<component name="ProjectId" id="1xTJAEDbe0fcNM9Y4aF92Tu62kw" />
|
|
|
<component name="ProjectViewState">
|
|
|
- <option name="flattenPackages" value="true" />
|
|
|
<option name="showExcludedFiles" value="false" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
- <option name="showMembers" value="true" />
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="DatabaseDriversLRU" value="mysql" />
|
|
|
@@ -82,19 +87,6 @@
|
|
|
</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"" />
|
|
|
@@ -223,6 +215,7 @@
|
|
|
<workItem from="1630629477920" duration="9491000" />
|
|
|
<workItem from="1630640511034" duration="10090000" />
|
|
|
<workItem from="1630656368650" duration="64000" />
|
|
|
+ <workItem from="1630656901862" duration="33000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修改客户跟进列表">
|
|
|
<created>1630486551669</created>
|