From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/entity/Api1209.java | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 7583de5..23859e4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -12,6 +12,7 @@
import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -24,67 +25,67 @@
public class Api1209 extends ApiParent implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -8920645721282111145L;
-
-
- public static String SORT_PROP = "sydh";
-
+ *
+ */
+ private static final long serialVersionUID = -8920645721282111145L;
- @Id
- @PropertyDef(label = "鎹熸孩鍗曞彿" )
+
+ public static String SORT_PROP = "sydh";
+
+
+ @Id
+ @PropertyDef(label = "鎹熸孩鍗曞彿")
@Column(name = "sydh", length = 60)
private String sydh;
- @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @PropertyDef(label = "璐т綅浠ｇ爜")
@Column(name = "hwdm", length = 30)
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
@Column(name = "tyhwbm", length = 28)
private String tyhwbm;
@JSONField(format = "yyyy-MM-dd")
- @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
@Column(name = "ywrq")
private Date ywrq;
- @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)")
@Column(name = "rkjz", precision = 20, scale = 6)
private double rkjz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍏ュ簱鏃堕棿" )
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
@Column(name = "rksj")
private Date rksj;
- @PropertyDef(label = "鍏ュ簱姘村垎(%)" )
+ @PropertyDef(label = "鍏ュ簱姘村垎(%)")
@Column(name = "rksf", precision = 20, scale = 6)
private double rksf;
- @PropertyDef(label = "鍏ュ簱鏉傝川(%)" )
+ @PropertyDef(label = "鍏ュ簱鏉傝川(%)")
@Column(name = "rkzz", precision = 20, scale = 6)
private double rkzz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍑哄簱鏃堕棿" )
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
@Column(name = "cksj")
private Date cksj;
- @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)")
@Column(name = "ckjz", precision = 20, scale = 6)
private double ckjz;
- @PropertyDef(label = "鍑哄簱姘村垎(%)" )
+ @PropertyDef(label = "鍑哄簱姘村垎(%)")
@Column(name = "cksf", precision = 20, scale = 6)
private double cksf;
- @PropertyDef(label = "鍑哄簱鏉傝川(%)" )
+ @PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 20, scale = 6)
private double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)" )
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
@Column(name = "jzsysl", precision = 20, scale = 6)
private double jzsysl;
@@ -92,55 +93,63 @@
@Column(name = "qzchwqsh", precision = 20, scale = 6)
private double qzchwqsh;
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)")
@Column(name = "qzszkl", precision = 20, scale = 6)
private double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)")
@Column(name = "qzzrshde", precision = 20, scale = 6)
private double qzzrshde;
- @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
+ @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
@Column(name = "chsl", precision = 20, scale = 6)
private double chsl;
- @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父" )
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
@Column(name = "sysfzc", length = 1)
private String sysfzc;
- @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- @Column(name = "sylx",length = 1)
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ @Column(name = "sylx", length = 1)
private String sylx;
- @PropertyDef(label = "鎹熸孩鐜妭",description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
- @Column(name = "syhj",length = 1)
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ @Column(name = "ccsc",precision = 3)
+ private BigDecimal ccsc;
+
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ @Column(name = "sfch", length = 1)
+ private String sfch;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ @Column(name = "syhj", length = 1)
private String syhj;
- @PropertyDef(label = "鎹熸孩鍘熷洜" )
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
@Column(name = "syyy", length = 400)
private String syyy;
- @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
@Column(name = "ccshr", length = 64)
private String ccshr;
- @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
@Column(name = "zjshr", length = 64)
private String zjshr;
- @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
@Column(name = "tjshr", length = 64)
private String tjshr;
- @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
@Column(name = "kjshr", length = 64)
private String kjshr;
- @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
@Column(name = "ldshr", length = 64)
private String ldshr;
- @PropertyDef(label = "澶囨敞" )
+ @PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
--
Gitblit v1.9.3