From d0c3258ed4871f2b9f03357bfd39b6caeff156b0 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 09 一月 2024 11:07:59 +0800
Subject: [PATCH] 修订版3.0
---
data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 232eb34..ad81cb9 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
@@ -9,8 +9,11 @@
import java.time.LocalDateTime;
import java.util.Date;
+import cn.hutool.core.annotation.Alias;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -18,6 +21,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
/**
@@ -27,6 +31,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
+@Accessors(chain = true)
public class DataReporting extends OrderBy implements Serializable {
/**
@@ -34,6 +39,7 @@
*/
@NotNull(message="[]涓嶈兘涓虹┖")
@ApiModelProperty("涓婚敭")
+ @TableId(type = IdType.AUTO)
private Integer id;
/**
* 鐧昏浜�
@@ -59,6 +65,12 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ValueTableShow(3)
private String name;
+
+ @ApiModelProperty("濮撳悕")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String name2;
+
/**
* 娓犻亾
*/
@@ -67,6 +79,12 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ValueTableShow(4)
private String channel;
+
+ @ApiModelProperty("浠ｇ悊鍟�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String agent;
+
/**
* 椤圭洰
*/
@@ -80,7 +98,7 @@
*/
@ApiModelProperty("灞曠幇閲�")
@ValueTableShow(6)
- private Integer show;
+ private Integer showNum;
/**
* 鐐瑰嚮閲�
*/
@@ -144,7 +162,7 @@
/**
* 浠ｇ悊杩旂偣
*/
- @ApiModelProperty("浠ｇ悊杩旂偣")
+ @ApiModelProperty("鍛樺伐浠ｇ悊杩旂偣")
@ValueTableShow(17)
private BigDecimal agentRebate;
/**
@@ -156,7 +174,7 @@
/**
* 澶囩敤瀛楁
*/
- @ApiModelProperty("澶囩敤瀛楁")
+ @ApiModelProperty("鍋氳繘鏉�")
@ValueTableShow(23)
private BigDecimal remark;
/**
@@ -181,13 +199,15 @@
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鍒涘缓鐢ㄦ埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
/**
*
*/
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鏇存柊鐢ㄦ埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
}
--
Gitblit v1.9.3