|
@@ -4,46 +4,20 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</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/GRegulatorBoxController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEmergencyRepairPhoto.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBoxPhoto.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairPhotoBo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxPhotoBo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairPhotoVo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxPhotoVo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairPhotoMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxPhotoMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGEmergencyRepairPhotoService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxPhotoService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairPhotoServiceImpl.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxPhotoServiceImpl.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairPhotoMapper.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GRegulatorBoxPhotoMapper.xml" afterDir="false" />
|
|
|
+ <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
|
|
|
<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.2023-10-23.log" beforeDir="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-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.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-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-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/resources/mapper/GEmergencyRepairMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/mapper/GEmergencyRepairMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/mapper/GEmergencyRepairMapper.class" 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/GEmergencyRepairMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/mapper/GEmergencyRepairMapper.xml" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -84,26 +58,26 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent"><![CDATA[{
|
|
|
- "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">{
|
|
|
+ "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>
|
|
|
+}</component>
|
|
|
<component name="ReactorSettings">
|
|
|
<option name="notificationShown" value="true" />
|
|
|
</component>
|
|
@@ -165,11 +139,49 @@
|
|
|
<workItem from="1698108724618" duration="7941000" />
|
|
|
<workItem from="1698129688036" duration="3327000" />
|
|
|
<workItem from="1698194223613" duration="3556000" />
|
|
|
- <workItem from="1698201966791" duration="2001000" />
|
|
|
+ <workItem from="1698201966791" duration="7531000" />
|
|
|
+ <workItem from="1698281101623" duration="4087000" />
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00001" summary="提交代码">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1698203984719</created>
|
|
|
+ <option name="number" value="00001" />
|
|
|
+ <option name="presentableId" value="LOCAL-00001" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1698203984719</updated>
|
|
|
</task>
|
|
|
+ <option name="localTasksCounter" value="2" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
<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 name="VcsManagerConfiguration">
|
|
|
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
|
|
+ <option name="CHECK_NEW_TODO" value="false" />
|
|
|
+ <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>
|