|
@@ -5,19 +5,50 @@
|
|
|
</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/gas/GCourtyardNetworkManagementController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GWarningPileController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUserController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GCourtyardNetworkManagement.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GNetworkManagementPhoto.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GWarningPile.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GCourtyardNetworkManagementBo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GNetworkManagementPhotoBo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GWarningPileBo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GCourtyardNetworkManagementVo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GNetworkManagementPhotoVo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GWarningPileVo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GCourtyardNetworkManagementMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GNetworkManagementPhotoMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GWarningPileMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGCourtyardNetworkManagementService.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGNetworkManagementPhotoService.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGWarningPileService.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GCourtyardNetworkManagementServiceImpl.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GNetworkManagementPhotoServiceImpl.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GNetworkManagementPhotoMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MUserBo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MUserVo.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MUserMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMUserService.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MUserServiceImpl.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MUserMapper.xml" 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" />
|
|
|
<change beforePath="$PROJECT_DIR$/logs/sys-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-error.log" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/logs/sys-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-info.log" afterDir="false" />
|
|
|
<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-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-dev.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application-dev.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GAreaServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GAreaServiceImpl.class" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.class" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/mapper/GAreaPhotoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/mapper/GAreaPhotoMapper.xml" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -58,26 +89,27 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent">{
|
|
|
- "keyToString": {
|
|
|
- "RequestMappingsPanelOrder0": "0",
|
|
|
- "RequestMappingsPanelOrder1": "1",
|
|
|
- "RequestMappingsPanelWidth0": "75",
|
|
|
- "RequestMappingsPanelWidth1": "75",
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "WebServerToolWindowFactoryState": "false",
|
|
|
- "git-widget-placeholder": "master",
|
|
|
- "last_opened_file_path": "D:/project/java/zhendashizheng/ruoyi-gas/src/main/resources/mapper",
|
|
|
- "node.js.detected.package.eslint": "true",
|
|
|
- "node.js.detected.package.tslint": "true",
|
|
|
- "node.js.selected.package.eslint": "(autodetect)",
|
|
|
- "node.js.selected.package.tslint": "(autodetect)",
|
|
|
- "nodejs_package_manager_path": "npm",
|
|
|
- "settings.editor.selected.configurable": "com.zeroturnaround.javarebel.idea.plugin.settings.AdvancedConfigurable",
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
+ "keyToString": {
|
|
|
+ "RequestMappingsPanelOrder0": "0",
|
|
|
+ "RequestMappingsPanelOrder1": "1",
|
|
|
+ "RequestMappingsPanelWidth0": "75",
|
|
|
+ "RequestMappingsPanelWidth1": "75",
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
+ "git-widget-placeholder": "master",
|
|
|
+ "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)",
|
|
|
+ "node.js.selected.package.tslint": "(autodetect)",
|
|
|
+ "nodejs_package_manager_path": "npm",
|
|
|
+ "settings.editor.selected.configurable": "com.zeroturnaround.javarebel.idea.plugin.settings.AdvancedConfigurable",
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
|
}
|
|
|
-}</component>
|
|
|
+}]]></component>
|
|
|
<component name="ReactorSettings">
|
|
|
<option name="notificationShown" value="true" />
|
|
|
</component>
|
|
@@ -86,9 +118,14 @@
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
- <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" />
|
|
|
+ <recent name="D:\project\java\zhendashizheng\ruoyi-mobile\src\main\java\com\ruoyi\mobile\domain\bo" />
|
|
|
+ <recent name="D:\project\java\zhendashizheng\ruoyi-mobile\src\main\java\com\ruoyi\mobile\domain\vo" />
|
|
|
+ <recent name="D:\project\java\zhendashizheng\ruoyi-mobile\src\main\resources\mapper\mobile" />
|
|
|
+ <recent name="D:\project\java\zhendashizheng\ruoyi-mobile\src\main\java\com\ruoyi\mobile\mapper" />
|
|
|
+ </key>
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
<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" />
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
@@ -140,7 +177,8 @@
|
|
|
<workItem from="1698129688036" duration="3327000" />
|
|
|
<workItem from="1698194223613" duration="3556000" />
|
|
|
<workItem from="1698201966791" duration="7531000" />
|
|
|
- <workItem from="1698281101623" duration="4087000" />
|
|
|
+ <workItem from="1698281101623" duration="8631000" />
|
|
|
+ <workItem from="1698301838507" duration="1160000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="提交代码">
|
|
|
<option name="closed" value="true" />
|
|
@@ -150,7 +188,15 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1698203984719</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="2" />
|
|
|
+ <task id="LOCAL-00002" summary="提交代码">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1698295783555</created>
|
|
|
+ <option name="number" value="00002" />
|
|
|
+ <option name="presentableId" value="LOCAL-00002" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1698295783555</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="3" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -173,15 +219,4 @@
|
|
|
<MESSAGE value="提交代码" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="提交代码" />
|
|
|
</component>
|
|
|
- <component name="XDebuggerManager">
|
|
|
- <breakpoint-manager>
|
|
|
- <breakpoints>
|
|
|
- <line-breakpoint enabled="true" type="java-line">
|
|
|
- <url>file://$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java</url>
|
|
|
- <line>153</line>
|
|
|
- <option name="timeStamp" value="1" />
|
|
|
- </line-breakpoint>
|
|
|
- </breakpoints>
|
|
|
- </breakpoint-manager>
|
|
|
- </component>
|
|
|
</project>
|