ERP_override.git

			@@ -1,6 +1,6 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
			<component name="dataSourceStorageLocal" created-in="IU-232.8660.185">
			<data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
			<database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
			<extra-name-characters>#@</extra-name-characters>

			@@ -149,7 +149,7 @@
			left join
			(select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
			from patch_log
			group by reporting_work_id,order_sort,technology_number) as c
			group by process_id,order_sort,technology_number) as c
			on c.process_id = fc.process_id
			and c.order_sort = fc.order_number
			and c.technology_number = fc.technology_number
			@@ -208,7 +208,7 @@
			left join
			(select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
			from patch_log
			group by reporting_work_id,order_sort,technology_number) as c
			group by process_id,order_sort,technology_number) as c
			on c.process_id = fc.process_id
			and c.order_sort = fc.order_number
			and c.technology_number = fc.technology_number

	north-glass-erp/.idea/dataSources.local.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ReportingWork.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史