|
|
@@ -4,31 +4,36 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、修改图形验证码的字体,以便在linux中使用">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/service/SysDicService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchPO.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/service/SysDicItemService.java" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java" afterDir="false" />
|
|
|
+ <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、字典管理">
|
|
|
+ <change afterPath="$PROJECT_DIR$/core/pom.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/pom.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.xml" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Enum/ErrorCodeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/Enum/ErrorCodeEnum.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/entity/FramePage.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/entity/FramePage.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/ApiResult.java" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/LongtoStringSerialize.java" beforeDir="false" afterPath="$PROJECT_DIR$/core/src/main/java/com/ctsi/utils/LongtoStringSerialize.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
+ <component name="ChangesViewManager">
|
|
|
+ <option name="groupingKeys">
|
|
|
+ <option value="module" />
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
<option name="RECENT_TEMPLATES">
|
|
|
<list>
|
|
|
@@ -44,6 +49,9 @@
|
|
|
<option name="lastSelectedView" value="all" />
|
|
|
<option name="username" value="matrix" />
|
|
|
</component>
|
|
|
+ <component name="MarkdownSettingsMigration">
|
|
|
+ <option name="stateVersion" value="1" />
|
|
|
+ </component>
|
|
|
<component name="MavenImportPreferences">
|
|
|
<option name="generalSettings">
|
|
|
<MavenGeneralSettings>
|
|
|
@@ -65,41 +73,55 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent"><![CDATA[{
|
|
|
- "keyToString": {
|
|
|
- "ASKED_ADD_EXTERNAL_FILES": "true",
|
|
|
- "Maven.application [clean].executor": "Run",
|
|
|
- "Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor": "Run",
|
|
|
- "Maven.application [package].executor": "Run",
|
|
|
- "Maven.my-spring-boot-app [clean].executor": "Run",
|
|
|
- "RequestMappingsPanelOrder0": "0",
|
|
|
- "RequestMappingsPanelOrder1": "1",
|
|
|
- "RequestMappingsPanelWidth0": "75",
|
|
|
- "RequestMappingsPanelWidth1": "75",
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "Spring Boot.Application.executor": "Debug",
|
|
|
- "jdk.selected.JAVA_MODULE": "1.8",
|
|
|
- "kotlin-language-version-configured": "true",
|
|
|
- "last_opened_file_path": "C:/Users/setin/IdeaProjects/GeneralFrame/application/src/main/java/com/ctsi/System",
|
|
|
- "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",
|
|
|
- "project.structure.last.edited": "模块",
|
|
|
- "project.structure.proportion": "0.0",
|
|
|
- "project.structure.side.proportion": "0.0",
|
|
|
- "settings.editor.selected.configurable": "org.codinjutsu.tools.jenkins.servers",
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
+ <component name="PropertiesComponent">{
|
|
|
+ "keyToString": {
|
|
|
+ "ASKED_ADD_EXTERNAL_FILES": "true",
|
|
|
+ "Maven.application [clean].executor": "Run",
|
|
|
+ "Maven.application [install].executor": "Run",
|
|
|
+ "Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor": "Run",
|
|
|
+ "Maven.application [org.apache.maven.plugins:maven-install-plugin:2.5.2:install].executor": "Run",
|
|
|
+ "Maven.application [package].executor": "Run",
|
|
|
+ "Maven.core [clean].executor": "Run",
|
|
|
+ "Maven.core [install].executor": "Run",
|
|
|
+ "Maven.core [org.apache.maven.plugins:maven-clean-plugin:3.2.0:clean].executor": "Run",
|
|
|
+ "Maven.core [org.apache.maven.plugins:maven-install-plugin:3.1.1:install].executor": "Run",
|
|
|
+ "Maven.core [package].executor": "Run",
|
|
|
+ "Maven.my-spring-boot-app [clean].executor": "Run",
|
|
|
+ "Maven.my-spring-boot-app [package].executor": "Run",
|
|
|
+ "Maven.myframe [clean,install].executor": "Run",
|
|
|
+ "Maven.myframe [clean].executor": "Run",
|
|
|
+ "Maven.myframe [package].executor": "Run",
|
|
|
+ "Maven.work [clean].executor": "Run",
|
|
|
+ "Maven.work [install].executor": "Run",
|
|
|
+ "Maven.work [package].executor": "Run",
|
|
|
+ "RequestMappingsPanelOrder0": "0",
|
|
|
+ "RequestMappingsPanelOrder1": "1",
|
|
|
+ "RequestMappingsPanelWidth0": "75",
|
|
|
+ "RequestMappingsPanelWidth1": "75",
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
+ "Spring Boot.Application.executor": "Debug",
|
|
|
+ "jdk.selected.JAVA_MODULE": "1.8",
|
|
|
+ "kotlin-language-version-configured": "true",
|
|
|
+ "last_opened_file_path": "C:/Users/setin/IdeaProjects/GeneralFrame/application/src/main/java/com/ctsi/System",
|
|
|
+ "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",
|
|
|
+ "project.structure.last.edited": "模块",
|
|
|
+ "project.structure.proportion": "0.0",
|
|
|
+ "project.structure.side.proportion": "0.0",
|
|
|
+ "settings.editor.selected.configurable": "org.codinjutsu.tools.jenkins.servers",
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
|
},
|
|
|
- "keyToStringList": {
|
|
|
- "DatabaseDriversLRU": [
|
|
|
- "mongo",
|
|
|
- "mysql"
|
|
|
+ "keyToStringList": {
|
|
|
+ "DatabaseDriversLRU": [
|
|
|
+ "mongo",
|
|
|
+ "mysql"
|
|
|
]
|
|
|
}
|
|
|
-}]]></component>
|
|
|
+}</component>
|
|
|
<component name="ReactorSettings">
|
|
|
<option name="notificationShown" value="true" />
|
|
|
</component>
|
|
|
@@ -109,11 +131,11 @@
|
|
|
<recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\java\com\ctsi" />
|
|
|
</key>
|
|
|
<key name="CopyClassDialog.RECENTS_KEY">
|
|
|
+ <recent name="com.ctsi.utils" />
|
|
|
+ <recent name="com.ctsi.entity" />
|
|
|
+ <recent name="com.ctsi.Enum" />
|
|
|
<recent name="com.ctsi.System.SysDicItem.entity" />
|
|
|
<recent name="com.ctsi.Auth.entity" />
|
|
|
- <recent name="com.ctsi.System.SysRole.entity.PO" />
|
|
|
- <recent name="com.ctsi.System.SysUserRole.entity.PO" />
|
|
|
- <recent name="com.ctsi.SysUserRole.entity" />
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunManager">
|
|
|
@@ -144,7 +166,10 @@
|
|
|
<workItem from="1704693899463" duration="56714000" />
|
|
|
<workItem from="1704875622703" duration="2299000" />
|
|
|
<workItem from="1704932572547" duration="31458000" />
|
|
|
- <workItem from="1705278479826" duration="37226000" />
|
|
|
+ <workItem from="1705278479826" duration="43131000" />
|
|
|
+ <workItem from="1705392945258" duration="4784000" />
|
|
|
+ <workItem from="1705397771531" duration="2808000" />
|
|
|
+ <workItem from="1705452083011" duration="2048000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="基础框架配置">
|
|
|
<option name="closed" value="true" />
|
|
|
@@ -410,7 +435,15 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1705370862985</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="34" />
|
|
|
+ <task id="LOCAL-00034" summary="1、字典管理">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1705387037146</created>
|
|
|
+ <option name="number" value="00034" />
|
|
|
+ <option name="presentableId" value="LOCAL-00034" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1705387037146</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="35" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
@@ -429,7 +462,6 @@
|
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
|
|
- <MESSAGE value="1、修改登录接口的userName字段 2、long类型的id使用string字符串传递给前端 3、优化用户相关接口 4、新增用户详情表 5、新增mybatis-plus-join" />
|
|
|
<MESSAGE value="1、菜单接口、部门接口" />
|
|
|
<MESSAGE value="1、部门列表树型结构构建" />
|
|
|
<MESSAGE value="1、角色表" />
|
|
|
@@ -454,7 +486,8 @@
|
|
|
<MESSAGE value="1、优化import" />
|
|
|
<MESSAGE value="1、debug" />
|
|
|
<MESSAGE value="1、修改图形验证码的字体,以便在linux中使用" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="1、修改图形验证码的字体,以便在linux中使用" />
|
|
|
+ <MESSAGE value="1、字典管理" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="1、字典管理" />
|
|
|
</component>
|
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
|
<expand />
|