From 0e9b215cbc05b20d4f9a677b4c9623388ba7f3f7 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 02 十一月 2023 10:31:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mtmmwms' into mtmmwms --- .idea/workspace.xml | 68 ++++++++++++++++++++++++++++++++++ .idea/misc.xml | 6 +++ .idea/wms_app.iml | 9 ++++ 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectRootManager"> + <output url="file://$PROJECT_DIR$/out" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/wms_app.iml b/.idea/wms_app.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/wms_app.iml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 718ce47..864ad2d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,11 @@ <option name="autoReloadType" value="SELECTIVE" /> </component> <component name="ChangeListManager"> +<<<<<<< HEAD <list default="true" id="3511a345-4d79-4992-8675-dec24ac8e81a" name="Changes" comment="#" /> +======= + <list default="true" id="27540a7d-3f63-4c4a-abfc-e2a9c26a1c3a" name="Changes" comment="#" /> +>>>>>>> origin/mtmmwms <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -13,11 +17,16 @@ <component name="Git.Settings"> <option name="RECENT_BRANCH_BY_REPOSITORY"> <map> +<<<<<<< HEAD <entry key="$PROJECT_DIR$" value="jzwms" /> +======= + <entry key="$PROJECT_DIR$" value="jkwms" /> +>>>>>>> origin/mtmmwms </map> </option> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> +<<<<<<< HEAD <component name="ProblemsViewState"> <option name="selectedTabId" value="DEPENDENCY_CHECKER_PROBLEMS_TAB" /> </component> @@ -25,10 +34,17 @@ "associatedIndex": 3 }</component> <component name="ProjectId" id="2VHdaWeRcDF4aLi2gteXpxKFc6A" /> +======= + <component name="ProjectColorInfo">{ + "associatedIndex": 4 +}</component> + <component name="ProjectId" id="2Wau6UBvwEwe0sjIaraE1SSyKsb" /> +>>>>>>> origin/mtmmwms <component name="ProjectViewState"> <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> +<<<<<<< HEAD <component name="PropertiesComponent">{ "keyToString": { "RunOnceActivity.OpenProjectViewOnStart": "true", @@ -165,6 +181,51 @@ <updated>1698891587271</updated> </task> <option name="localTasksCounter" value="12" /> +======= + <component name="PropertiesComponent"><![CDATA[{ + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "ts.external.directory.path": "D:\\Program File\\IntelliJ IDEA 2023.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external", + "vue.rearranger.settings.migration": "true" + } +}]]></component> + <component name="RunManager"> + <configuration default="true" type="JetRunConfigurationType"> + <module name="wms_app" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType"> + <module name="wms_app" /> + <option name="filePath" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + </component> + <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="27540a7d-3f63-4c4a-abfc-e2a9c26a1c3a" name="Changes" comment="#" /> + <created>1696982837648</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1696982837648</updated> + <workItem from="1696982840108" duration="1034000" /> + <workItem from="1697069029748" duration="1200000" /> + <workItem from="1697160928498" duration="612000" /> + <workItem from="1697330263478" duration="2880000" /> + <workItem from="1697449532351" duration="17000" /> + <workItem from="1697760672872" duration="47000" /> + </task> +>>>>>>> origin/mtmmwms <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -181,7 +242,11 @@ <entry key="branch"> <value> <list> +<<<<<<< HEAD <option value="mtmmwms" /> +======= + <option value="origin/jkwms" /> +>>>>>>> origin/mtmmwms </list> </value> </entry> @@ -194,8 +259,11 @@ </option> </component> <component name="VcsManagerConfiguration"> +<<<<<<< HEAD <MESSAGE value="#璁㈠崟缁勬墭2" /> <MESSAGE value="#pda鐗╂枡椤甸潰" /> +======= +>>>>>>> origin/mtmmwms <MESSAGE value="#" /> <option name="LAST_COMMIT_MESSAGE" value="#" /> </component> -- Gitblit v1.9.1