From e46fb3504492d1a84e63c531794a90d01799dbac Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 23 一月 2024 13:43:26 +0800
Subject: [PATCH] 修改实体类和数据库连接
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 3 ++-
north-glass-erp/target/classes/mapper/sd/Product.xml | 2 ++
north-glass-erp/target/classes/application.yml | 20 ++++++++++----------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 2d9d3fc..6e65b5b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -14,6 +14,7 @@
private Integer orderNumber;
private String buildingNumber;
+ private Integer productId;
private String productName;
private Double price;
private Long quantity;
@@ -39,6 +40,6 @@
private LocalDate updateTime;
private Order order;
- private Product product;
+ //private Product product;
}
diff --git a/north-glass-erp/target/classes/application.yml b/north-glass-erp/target/classes/application.yml
index 0109f84..bb342d6 100644
--- a/north-glass-erp/target/classes/application.yml
+++ b/north-glass-erp/target/classes/application.yml
@@ -19,13 +19,13 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
-# mm:
-# url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
-# username: root
-# password: beibo.123/
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# pp:
-# url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
-# username: root
-# password: beibo.123/
-# driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
+ mm:
+ url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ pp:
+ url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/sd/Product.xml b/north-glass-erp/target/classes/mapper/sd/Product.xml
index ae51f90..1815692 100644
--- a/north-glass-erp/target/classes/mapper/sd/Product.xml
+++ b/north-glass-erp/target/classes/mapper/sd/Product.xml
@@ -15,10 +15,12 @@
<result column="creator" property="creator"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
+ <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
<result column="type_id" property="typeID"/>
<result column="type_name" property="typeName"/>
</association>
+
<!--<result column="g_typeId" property="glassTypes.typeId"/>
<result column="g_type" property="glassTypes.type"/>-->
--
Gitblit v1.8.0