From 02a11da1ca0523e4f8e3d7273904da816f951ffc Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 01:54:36 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
index ad81cb9..02c1b29 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
@@ -72,6 +72,15 @@
private String name2;
/**
+ * 椤圭洰
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("椤圭洰")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String product;
+
+ /**
* 娓犻亾
*/
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -85,14 +94,6 @@
@ValueTableShow(4)
private String agent;
- /**
- * 椤圭洰
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(5)
- private String product;
/**
* 灞曠幇閲�
*/
@@ -171,6 +172,11 @@
@ApiModelProperty("瀹㈡埛杩旂偣")
@ValueTableShow(18)
private BigDecimal customerRebate;
+
+ @ApiModelProperty("寰俊鍙�")
+ @ValueTableShow(19)
+ private String vxCard;
+
/**
* 澶囩敤瀛楁
*/
@@ -180,7 +186,7 @@
/**
*
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("绯荤粺鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(20)
@@ -188,7 +194,7 @@
/**
*
*/
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @ApiModelProperty("鐧昏鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(21)
--
Gitblit v1.9.3