|
@@ -5,7 +5,28 @@
|
|
</component>
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="增加master缺失文件,3.11">
|
|
<list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="增加master缺失文件,3.11">
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/ManualController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/ManualController.java" afterDir="false" />
|
|
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/AppsClientsController.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/AppsController.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/AppsDescController.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Apps.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/AppsClients.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/AppsDesc.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/vo/AppsAddVO.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/vo/AppsVO.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/AppsClientsMapper.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/AppsDescMapper.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/AppsMapper.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IAppsClientsService.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IAppsDescService.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IAppsService.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/AppsClientsServiceImpl.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/AppsDescServiceImpl.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/AppsServiceImpl.java" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AppsClientsMapper.xml" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AppsDescMapper.xml" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AppsMapper.xml" 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/om/service/impl/DiagClientsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/DiagClientsServiceImpl.java" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -66,10 +87,10 @@
|
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
"Spring Boot.OperationApplication.executor": "Run",
|
|
"Spring Boot.OperationApplication.executor": "Run",
|
|
"WebServerToolWindowFactoryState": "false",
|
|
"WebServerToolWindowFactoryState": "false",
|
|
- "git-widget-placeholder": "permission-wxy",
|
|
|
|
|
|
+ "git-widget-placeholder": "master",
|
|
"ignore.virus.scanning.warn.message": "true",
|
|
"ignore.virus.scanning.warn.message": "true",
|
|
"kotlin-language-version-configured": "true",
|
|
"kotlin-language-version-configured": "true",
|
|
- "last_opened_file_path": "C:/Users/wxy/IdeasProjects/outsourcing/OperationSystem/pom.xml",
|
|
|
|
|
|
+ "last_opened_file_path": "C:/Users/wxy/IdeasProjects/outsourcing/OperationSystem/src/main/resources/mapper",
|
|
"node.js.detected.package.eslint": "true",
|
|
"node.js.detected.package.eslint": "true",
|
|
"node.js.detected.package.tslint": "true",
|
|
"node.js.detected.package.tslint": "true",
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -213,6 +234,7 @@
|
|
<workItem from="1709599670703" duration="7522000" />
|
|
<workItem from="1709599670703" duration="7522000" />
|
|
<workItem from="1710143546149" duration="258000" />
|
|
<workItem from="1710143546149" duration="258000" />
|
|
<workItem from="1710143821704" duration="561000" />
|
|
<workItem from="1710143821704" duration="561000" />
|
|
|
|
+ <workItem from="1710335409948" duration="1570000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00001" summary="管理员登录">
|
|
<task id="LOCAL-00001" summary="管理员登录">
|
|
<option name="closed" value="true" />
|
|
<option name="closed" value="true" />
|