|
@@ -5,11 +5,7 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="494e7e12-0e43-41f1-b914-44d06666de04" name="Changes" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssay.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssayResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssayResult.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/ZAssayMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ZAssayMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/ZAssayResultMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ZAssayResultMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/robot/remote/smartrobotremote/domain/ZAssayResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/robot/remote/smartrobotremote/domain/ZAssayResult.java" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -38,30 +34,30 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent"><![CDATA[{
|
|
|
- "keyToString": {
|
|
|
- "Maven.smart-robot-remote [clean].executor": "Run",
|
|
|
- "Maven.smart-robot-remote [package].executor": "Run",
|
|
|
- "RequestMappingsPanelOrder0": "0",
|
|
|
- "RequestMappingsPanelOrder1": "1",
|
|
|
- "RequestMappingsPanelWidth0": "75",
|
|
|
- "RequestMappingsPanelWidth1": "75",
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "Spring Boot.SmartRobotRemoteApplication.executor": "Debug",
|
|
|
- "git-widget-placeholder": "master",
|
|
|
- "kotlin-language-version-configured": "true",
|
|
|
- "last_opened_file_path": "/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/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",
|
|
|
- "project.structure.last.edited": "Modules",
|
|
|
- "project.structure.proportion": "0.15",
|
|
|
- "project.structure.side.proportion": "0.2",
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
+ <component name="PropertiesComponent">{
|
|
|
+ "keyToString": {
|
|
|
+ "Maven.smart-robot-remote [clean].executor": "Run",
|
|
|
+ "Maven.smart-robot-remote [package].executor": "Run",
|
|
|
+ "RequestMappingsPanelOrder0": "0",
|
|
|
+ "RequestMappingsPanelOrder1": "1",
|
|
|
+ "RequestMappingsPanelWidth0": "75",
|
|
|
+ "RequestMappingsPanelWidth1": "75",
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
+ "Spring Boot.SmartRobotRemoteApplication.executor": "Debug",
|
|
|
+ "git-widget-placeholder": "master",
|
|
|
+ "kotlin-language-version-configured": "true",
|
|
|
+ "last_opened_file_path": "/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/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",
|
|
|
+ "project.structure.last.edited": "Modules",
|
|
|
+ "project.structure.proportion": "0.15",
|
|
|
+ "project.structure.side.proportion": "0.2",
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
|
}
|
|
|
-}]]></component>
|
|
|
+}</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="$PROJECT_DIR$/src/main/resources/mapper" />
|