|
@@ -5,8 +5,18 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MSysController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GWarningPileMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAboutUsController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MBuildingController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MCourtyardNetworkManagementController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MEmergencyRepairController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MExplainController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRegulatorBoxController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRotationController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUnitController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/logs/sys-console.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-console.log" afterDir="false" />
|
|
@@ -15,10 +25,7 @@
|
|
|
<change beforePath="$PROJECT_DIR$/logs/sys-user.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-user.log" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GWarningPile.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GWarningPile.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GWarningPileBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GWarningPileBo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GWarningPileVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GWarningPileVo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -55,11 +62,15 @@
|
|
|
</MavenGeneralSettings>
|
|
|
</option>
|
|
|
</component>
|
|
|
+ <component name="MavenRunner">
|
|
|
+ <option name="skipTests" value="true" />
|
|
|
+ </component>
|
|
|
<component name="ProjectColorInfo">{
|
|
|
"associatedIndex": 8
|
|
|
}</component>
|
|
|
<component name="ProjectId" id="2X0Ut6U1qBnv9dFdRoDzFZHm0TN" />
|
|
|
<component name="ProjectLevelVcsManager">
|
|
|
+ <OptionsSetting value="false" id="Update" />
|
|
|
<ConfirmationsSetting value="2" id="Add" />
|
|
|
</component>
|
|
|
<component name="ProjectViewState">
|
|
@@ -77,7 +88,7 @@
|
|
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
|
"WebServerToolWindowFactoryState": "false",
|
|
|
"git-widget-placeholder": "master",
|
|
|
- "last_opened_file_path": "D:/project/java/zhendashizheng/ruoyi-gas/src/main/java/com/ruoyi/gas",
|
|
|
+ "last_opened_file_path": "D:/project/java/zhendashizheng/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile",
|
|
|
"node.js.detected.package.eslint": "true",
|
|
|
"node.js.detected.package.tslint": "true",
|
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -95,16 +106,19 @@
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile" />
|
|
|
+ <recent name="D:\project\java\zhendashizheng" />
|
|
|
<recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\java\com\ruoyi\gas" />
|
|
|
<recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\gas" />
|
|
|
<recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main" />
|
|
|
- <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\resources\mapper" />
|
|
|
- <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile" />
|
|
|
</key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
<recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\resources\mapper" />
|
|
|
<recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\java\com\ruoyi\gas" />
|
|
|
</key>
|
|
|
+ <key name="CopyClassDialog.RECENTS_KEY">
|
|
|
+ <recent name="com.ruoyi.web.controller.mobile" />
|
|
|
+ </key>
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
|
<option name="configurationTypes">
|
|
@@ -157,6 +171,8 @@
|
|
|
<workItem from="1698201966791" duration="7531000" />
|
|
|
<workItem from="1698281101623" duration="8631000" />
|
|
|
<workItem from="1698301838507" duration="2817000" />
|
|
|
+ <workItem from="1698308761171" duration="1767000" />
|
|
|
+ <workItem from="1698367022283" duration="6034000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="提交代码">
|
|
|
<option name="closed" value="true" />
|