|
|
@@ -4,8 +4,8 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
-<<<<<<< HEAD
|
|
|
- <list default="true" id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment="">
|
|
|
+
|
|
|
+ <list default="true" id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment=""></list>
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
|
|
|
@@ -19,7 +19,7 @@
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
<component name="DefaultGradleProjectSettings">
|
|
|
<option name="testRunner" value="GRADLE" />
|
|
|
<option name="delegatedBuild" value="true" />
|
|
|
@@ -294,8 +294,8 @@
|
|
|
<pane id="PackagesPane" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
-<<<<<<< HEAD
|
|
|
- <component name="PropertiesComponent">
|
|
|
+
|
|
|
+ <component name="PropertiesComponent"></component>
|
|
|
<property name="RequestMappingsPanelOrder0" value="0" />
|
|
|
<property name="RequestMappingsPanelOrder1" value="1" />
|
|
|
<property name="RequestMappingsPanelWidth0" value="75" />
|
|
|
@@ -353,7 +353,7 @@
|
|
|
<option name="number" value="Default" />
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1706770138891</updated>
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
<workItem from="1706770142017" duration="13022000" />
|
|
|
=======
|
|
|
<workItem from="1706770142017" duration="4313000" />
|