From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java b/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
index 01f03eb..630579b 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutCustomer.java
@@ -1,31 +1,28 @@
package com.ld.igds.models;
import java.io.Serializable;
-
+import java.util.Date;
import com.bstek.dorado.annotation.PropertyDef;
-
import lombok.Data;
-
import javax.persistence.*;
/**
* 鍑哄叆搴撳鎴�-寰�鏉ュ崟浣嶄俊鎭�
*
- * @author
+ * @author czt
+ * @description 鐗堟湰4.0瀛楁宸插
+ * @date 2023-05-25 17:16
*/
@Data
@Entity
@Table(name = "D_INOUT_CUSTOMER")
public class InoutCustomer implements Serializable{
- /**
- *
- */
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鍗曚綅缂栫爜")
+ @PropertyDef(label = "涓婚敭id缂栫爜", description = "绯荤粺鍐呯紪鐮�")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -36,21 +33,33 @@
@PropertyDef(label = "鎵�灞炲垎搴�")
private String deptId;
- @Column(name = "NAME_", length = 50)
- @PropertyDef(label = "鍗曚綅鍚嶅悕绉�")
- private String name;
-
@Column(name = "TYPE_", length = 4)
- @PropertyDef(label = "瀹㈡埛鍒嗙被")
+ @PropertyDef(label = "瀹㈡埛鍒嗙被", description = "绯荤粺鍐呬娇鐢細鎻愯揣鍟嗐�佷緵璐у晢")
private String type;
- @Column(name = "CARD_ID_", length = 20)
- @PropertyDef(label = "韬唤璇佸彿")
- private String cardId;
+ @Column(name = "khlx", length = 50)
+ @PropertyDef(label = "鍗曚綅绫诲瀷", description = "1-浼佷笟锛�2-涓汉")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜鎴栬韩浠借瘉鍙�" )
+ @Column(name = "khtyshxydmhsfzh", length = 18)
+ private String khtyshxydmhsfzh;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String name;
+
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�" )
+ @Column(name = "fddbr", length = 64)
+ private String fddbr;
@Column(name = "ADDRESS_", length = 200)
- @PropertyDef(label = "鑱旂郴鍦板潃")
+ @PropertyDef(label = "閫氳鍦板潃")
private String address;
+
+ @PropertyDef(label = "閭斂缂栫爜" )
+ @Column(name = "yzbm", length = 6)
+ private String yzbm;
@Column(name = "CONTACT_USER_", length = 50)
@PropertyDef(label = "鑱旂郴浜�")
@@ -59,6 +68,14 @@
@Column(name = "PHONE_", length = 20)
@PropertyDef(label = "鑱旂郴鐢佃瘽")
private String phone;
+
+ @Column(name = "CARD_ID_", length = 20)
+ @PropertyDef(label = "鑱旂郴浜鸿韩浠借瘉鍙�")
+ private String cardId;
+
+ @PropertyDef(label = "鐢靛瓙淇＄" )
+ @Column(name = "dzyx", length = 64)
+ private String dzyx;
@Column(name = "BANK_", length = 50)
@PropertyDef(label = "寮�鎴烽摱琛�")
@@ -72,8 +89,8 @@
@PropertyDef(label = "绉嶆闈㈢Н")
private Double foodArea = 0.0;
- @Transient
- @PropertyDef(label = "閫氱煡鍗昳d", description = "鑾峰彇閫氱煡鍗昳d浣跨敤")
- private String noticeId;
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
}
--
Gitblit v1.9.3