ERP_override.git

			@@ -5,14 +5,7 @@
			</component>
			<component name="ChangeListManager">
			<list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="更改" comment="11.24提交">
			<change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/northglass-erp/src/components/basic/BasicTable.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/components/basic/BasicTable.vue" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/northglass-erp/src/hook/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/hook/index.js" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/northglass-erp/src/stores/sd/product/prduct.js" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/northglass-erp/src/views/LoginView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/LoginView.vue" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -222,7 +215,7 @@
			<workItem from="1702858329054" duration="9016000" />
			<workItem from="1703031064839" duration="55055000" />
			<workItem from="1703463546867" duration="16447000" />
			<workItem from="1703811064202" duration="7449000" />
			<workItem from="1703811064202" duration="8050000" />
			</task>
			<task id="LOCAL-00001" summary="第一次推送">
			<option name="closed" value="true" />