| 
					
				 | 
			
			
				@@ -1,18 +1,11 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <?xml version="1.0" encoding="UTF-8"?> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <project version="4"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <component name="ChangeListManager"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1.完善地址或自提文案;"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <list default="true" id="08cfebb0-a4a4-47ee-a307-566aa06f29bb" name="Default Changelist" comment="1.忽略运行日志文件;"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <change beforePath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/egg-ts-helper/.tmp/eggInfo.json" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/logs/egg-schedule.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/logs/egg-schedule.log" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/logs/egg-universal-szjcomo-egg-core.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/logs/egg-universal-szjcomo-egg-core.log" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/logs/egg-universal-szjcomo-egg-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/logs/egg-universal-szjcomo-egg-error.log" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/run/agent_timing_13660.json" beforeDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/run/application_timing_18044.json" beforeDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/run/application_timing_18308.json" beforeDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <change beforePath="$PROJECT_DIR$/runtime/run/application_timing_3356.json" beforeDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <change beforePath="$PROJECT_DIR$/typings/app/index.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/typings/app/index.d.ts" afterDir="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </list> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <option name="SHOW_DIALOG" value="false" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <option name="HIGHLIGHT_CONFLICTS" value="true" /> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -56,25 +49,25 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <option name="hideEmptyMiddlePackages" value="true" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <option name="showLibraryContents" value="true" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   </component> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  <component name="PropertiesComponent"><![CDATA[{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  "keyToString": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "ASKED_MARK_IGNORED_FILES_AS_EXCLUDED": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "SHARE_PROJECT_CONFIGURATION_FILES": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "WebServerToolWindowFactoryState": "false", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "last_opened_file_path": "D:/ysjjCode/shop-system/app/service", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "node.js.detected.package.eslint": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "node.js.selected.package.eslint": "(autodetect)", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "nodejs_package_manager_path": "npm", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "settings.editor.selected.configurable": "preferences.keymap", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "ts.external.directory.path": "D:\\Program Files (x86)\\WebStorm 2022.2.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "vue.rearranger.settings.migration": "true" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  <component name="PropertiesComponent">{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  "keyToString": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "ASKED_MARK_IGNORED_FILES_AS_EXCLUDED": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "SHARE_PROJECT_CONFIGURATION_FILES": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "WebServerToolWindowFactoryState": "false", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "last_opened_file_path": "D:/ysjjCode/shop-system/app/service", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "node.js.detected.package.eslint": "true", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "node.js.selected.package.eslint": "(autodetect)", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "nodejs_package_manager_path": "npm", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "settings.editor.selected.configurable": "preferences.keymap", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "ts.external.directory.path": "D:\\Program Files (x86)\\WebStorm 2022.2.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "vue.rearranger.settings.migration": "true" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  "keyToStringList": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    "DatabaseDriversLRU": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      "mysql" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  "keyToStringList": { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    "DatabaseDriversLRU": [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      "mysql" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-}]]></component> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+}</component> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <component name="RecentsManager"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <key name="CopyFile.RECENT_KEYS"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <recent name="D:\ysjjCode\shop-system\app\service" /> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -629,7 +622,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   <entry key="branch"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     <value> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                       <list> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        <option value="origin/master" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        <option value="master" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                       </list> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     </value> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   </entry> 
			 |