From 5e82a52da8742dc157b4618c0c6c0d9156060c43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 八月 2024 14:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index fdcfa82..3f69894 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -1,6 +1,7 @@
package com.example.erp.entity.pp;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
@@ -55,18 +56,39 @@
//鍒嗘灦鍛�
private String founder;
//鍒嗘灦鏃堕棿
+ @TableField(value = "`splitFrame_time`")
private LocalDate splitFrameTime;
+ //鎺掑簭
+ private Integer sort;
//寤虹珛鏃堕棿
private LocalDate createTime;
//淇敼鏃堕棿
private LocalDate updateTime;
+ //鏌ヨ鐢�
+ //鎶ュ伐缂栧彿
+ @TableField(select = false,exist = false)
+ private String reportingWorkId;
+ //浜у搧鍚嶇О
+ @TableField(select = false,exist = false)
+ private String glassChild;
+ //宸ヨ壓娴佺▼
+ @TableField(select = false,exist = false)
+ private String process;
+ //娴佺▼鍗″悎骞�
+ @TableField(select = false,exist = false)
+ private Integer merge;
+
//澶栭敭璁㈠崟琛�
+ @TableField(select = false,exist= false)
private Order order;
//澶栭敭璁㈠崟鏄庣粏琛�
+ @TableField(select = false,exist= false)
private OrderDetail orderDetail;
//澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+ @TableField(select = false,exist= false)
private OrderGlassDetail orderGlassDetail;
+ @TableField(select = false,exist= false)
private Product product;
}
--
Gitblit v1.8.0