|
@@ -1,12 +1,17 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
<project version="4">
|
|
|
|
|
+ <component name="AutoImportSettings">
|
|
|
|
|
+ <option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
+ </component>
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
|
|
<list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" 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/template/controller/WxGzhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/WxGzhController.java" afterDir="false" />
|
|
|
|
|
+>>>>>>> f1a7fb9e14eab5fe0e1476af8d8b5df12bba7442
|
|
|
</list>
|
|
</list>
|
|
|
- <ignored path="$PROJECT_DIR$/classes/" />
|
|
|
|
|
- <ignored path="$PROJECT_DIR$/target/" />
|
|
|
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -16,6 +21,7 @@
|
|
|
<option name="testRunner" value="GRADLE" />
|
|
<option name="testRunner" value="GRADLE" />
|
|
|
<option name="delegatedBuild" value="true" />
|
|
<option name="delegatedBuild" value="true" />
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
<leaf>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
@@ -38,6 +44,8 @@
|
|
|
</file>
|
|
</file>
|
|
|
</leaf>
|
|
</leaf>
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+=======
|
|
|
|
|
+>>>>>>> f1a7fb9e14eab5fe0e1476af8d8b5df12bba7442
|
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
<findStrings>
|
|
|
<find>getDate</find>
|
|
<find>getDate</find>
|
|
@@ -62,11 +70,15 @@
|
|
|
</list>
|
|
</list>
|
|
|
</option>
|
|
</option>
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+ <component name="MarkdownSettingsMigration">
|
|
|
|
|
+ <option name="stateVersion" value="1" />
|
|
|
|
|
+ </component>
|
|
|
<component name="MavenImportPreferences">
|
|
<component name="MavenImportPreferences">
|
|
|
<option name="generalSettings">
|
|
<option name="generalSettings">
|
|
|
<MavenGeneralSettings>
|
|
<MavenGeneralSettings>
|
|
|
- <option name="mavenHome" value="D:/Software/Develop/Maven/apache-maven-3.3.9" />
|
|
|
|
|
- <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.3.9\conf\settings.xml" />
|
|
|
|
|
|
|
+ <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
|
|
|
|
|
+ <option name="useMavenConfig" value="true" />
|
|
|
|
|
+ <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
|
|
|
</MavenGeneralSettings>
|
|
</MavenGeneralSettings>
|
|
|
</option>
|
|
</option>
|
|
|
</component>
|
|
</component>
|
|
@@ -94,6 +106,7 @@
|
|
|
<option name="width" value="974" />
|
|
<option name="width" value="974" />
|
|
|
<option name="height" value="1039" />
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+ <component name="ProjectId" id="2bUCcpLSt0RtgnSW1oHNqhKVmxW" />
|
|
|
<component name="ProjectView">
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
<navigator proportions="" version="1">
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
<foldersAlwaysOnTop value="true" />
|
|
@@ -203,33 +216,20 @@
|
|
|
</pane>
|
|
</pane>
|
|
|
</panes>
|
|
</panes>
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="PropertiesComponent">
|
|
|
|
|
- <property name="RequestMappingsPanelOrder0" value="0" />
|
|
|
|
|
- <property name="RequestMappingsPanelOrder1" value="1" />
|
|
|
|
|
- <property name="RequestMappingsPanelWidth0" value="75" />
|
|
|
|
|
- <property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
|
|
- <property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
|
|
- <property name="aspect.path.notification.shown" value="true" />
|
|
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
|
- <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
|
|
|
|
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
|
|
- <property name="settings.editor.selected.configurable" value="MavenSettings" />
|
|
|
|
|
|
|
+ <component name="ProjectViewState">
|
|
|
|
|
+ <option name="showExcludedFiles" value="false" />
|
|
|
|
|
+ <option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
|
|
+ "keyToString": {
|
|
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
|
|
+ "settings.editor.selected.configurable": "MavenSettings",
|
|
|
|
|
+ "spring.configuration.checksum": "64bf9ba214eb006c40cb35e0f61a7d20"
|
|
|
|
|
+ }
|
|
|
|
|
+}]]></component>
|
|
|
<component name="RebelAgentSelection">
|
|
<component name="RebelAgentSelection">
|
|
|
<selection>jr</selection>
|
|
<selection>jr</selection>
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="RunDashboard">
|
|
|
|
|
- <option name="ruleStates">
|
|
|
|
|
- <list>
|
|
|
|
|
- <RuleState>
|
|
|
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
|
|
|
- </RuleState>
|
|
|
|
|
- <RuleState>
|
|
|
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
|
|
|
|
- </RuleState>
|
|
|
|
|
- </list>
|
|
|
|
|
- </option>
|
|
|
|
|
- </component>
|
|
|
|
|
<component name="RunManager">
|
|
<component name="RunManager">
|
|
|
<configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
<configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
<module name="mybatis_plus" />
|
|
<module name="mybatis_plus" />
|
|
@@ -239,6 +239,10 @@
|
|
|
</method>
|
|
</method>
|
|
|
</configuration>
|
|
</configuration>
|
|
|
</component>
|
|
</component>
|
|
|
|
|
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
|
|
|
+ <component name="SshConsoleOptionsProvider">
|
|
|
|
|
+ <option name="myEncoding" value="UTF-8" />
|
|
|
|
|
+ </component>
|
|
|
<component name="SvnConfiguration">
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
<configuration />
|
|
|
</component>
|
|
</component>
|
|
@@ -249,7 +253,13 @@
|
|
|
<option name="number" value="Default" />
|
|
<option name="number" value="Default" />
|
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1706250884671</updated>
|
|
<updated>1706250884671</updated>
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
<workItem from="1706250887209" duration="8970000" />
|
|
<workItem from="1706250887209" duration="8970000" />
|
|
|
|
|
+=======
|
|
|
|
|
+ <workItem from="1706250887209" duration="5674000" />
|
|
|
|
|
+ <workItem from="1706260354151" duration="17000" />
|
|
|
|
|
+ <workItem from="1706260659198" duration="67000" />
|
|
|
|
|
+>>>>>>> f1a7fb9e14eab5fe0e1476af8d8b5df12bba7442
|
|
|
</task>
|
|
</task>
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
@@ -300,7 +310,18 @@
|
|
|
</layout>
|
|
</layout>
|
|
|
</component>
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
- <option name="version" value="1" />
|
|
|
|
|
|
|
+ <option name="version" value="3" />
|
|
|
|
|
+ </component>
|
|
|
|
|
+ <component name="Vcs.Log.Tabs.Properties">
|
|
|
|
|
+ <option name="TAB_STATES">
|
|
|
|
|
+ <map>
|
|
|
|
|
+ <entry key="MAIN">
|
|
|
|
|
+ <value>
|
|
|
|
|
+ <State />
|
|
|
|
|
+ </value>
|
|
|
|
|
+ </entry>
|
|
|
|
|
+ </map>
|
|
|
|
|
+ </option>
|
|
|
</component>
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager>
|
|
<breakpoint-manager>
|
|
@@ -308,7 +329,6 @@
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java</url>
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java</url>
|
|
|
<line>70</line>
|
|
<line>70</line>
|
|
|
- <properties />
|
|
|
|
|
<option name="timeStamp" value="1" />
|
|
<option name="timeStamp" value="1" />
|
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
</breakpoints>
|