~admin/ERP_override.git

			@@ -1,11 +1,10 @@
			<?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" uuid="521b6701-da00-48a8-bf4f-cf6bbb7d685d">
			<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>
			<identifier-quote-string>`</identifier-quote-string>
			<jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
			</database-info>
			<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
			<secret-storage>master_key</secret-storage>
			@@ -26,7 +25,6 @@
			<database-info product="MySQL" version="8.0.19" 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.19" exact-driver-version="8.0">
			<extra-name-characters>#@</extra-name-characters>
			<identifier-quote-string>`</identifier-quote-string>
			<jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
			</database-info>
			<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
			<secret-storage>master_key</secret-storage>

			@@ -2,6 +2,9 @@

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.example.erp.entity.sd.Order;
			import com.example.erp.entity.sd.OrderDetail;
			import com.example.erp.entity.sd.OrderGlassDetail;

			import java.time.LocalDate;

			@@ -53,9 +56,9 @@
			private LocalDate updateTime;

			//外键订单表
			// private Order order;
			// //外键订单明细表
			// private OrderDetail orderDetail;
			// //外键订单工艺审核表
			// private orderGlassDetail orderGlassDetail;
			private Order order;
			//外键订单明细表
			private OrderDetail orderDetail;
			//外键订单工艺审核表
			private OrderGlassDetail orderGlassDetail;
			}

			@@ -5,7 +5,11 @@
			<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
			<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
			<id column="id" property="id"/>
			<<<<<<< HEAD
			<result column="product_name" property="productName"/>
			=======
			<result column="product" property="product"/>
			>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
			<result column="total_thickness" property="totalThickness"/>
			<result column="thickness" property="thickness"/>
			<result column="query" property="query"/>
			@@ -14,8 +18,13 @@
			<result column="creator" property="creator"/>
			<result column="create_time" property="createTime"/>
			<result column="update_time" property="updateTime"/>
			<<<<<<< HEAD
			<association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
			<result column="type_id" property="typeID"/>
			=======
			<association property="glassType" javaType="com.example.erp.entity.sd.GlassType">
			<result column="type_id" property="typeId"/>
			>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
			<result column="type_name" property="typeName"/>
			</association>
			<!--<result column="g_typeId" property="glassTypes.typeId"/>

	north-glass-erp/.idea/dataSources.local.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/Product.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史