From 7cf8ae446e880537a38bd7ac403bd53741a5294f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 一月 2024 09:21:19 +0800
Subject: [PATCH] 修订版2.0

---
 data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java |   54 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
index cd5080b..4cca3bc 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
@@ -37,6 +37,14 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
     /**
+     * 浠g悊鍏徃
+     */
+    @ValueTableShow
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("浠g悊鍟�")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String company;
+    /**
     * 璐︽埛鍚�
     */
     @ValueTableShow
@@ -45,37 +53,35 @@
     @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
     private String name;
     /**
-    * 浠g悊鍏徃
-    */
-    @ValueTableShow
-    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
-    @ApiModelProperty("浠g悊鍏徃")
-    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
-    private String company;
-    /**
     * 娑堣垂閲戦
     */
     @ValueTableShow
-    @ApiModelProperty("娑堣垂閲戦")
+    @ApiModelProperty("閲戦")
     private BigDecimal consumption;
     /**
-    * 鍏呭�奸噾棰�
-    */
-    @ValueTableShow
-    @ApiModelProperty("鍏呭�奸噾棰�")
-    private BigDecimal recharge;
-    /**
-    * 閫�娆鹃噾棰�
-    */
-    @ValueTableShow
-    @ApiModelProperty("閫�娆鹃噾棰�")
-    private BigDecimal refund;
-    /**
-    * 浠g悊杩旂偣
-    */
+     * 浠g悊杩旂偣
+     */
     @ValueTableShow
     @ApiModelProperty("浠g悊杩旂偣")
     private BigDecimal agentRebate;
+    /**
+    * 鎵撴浜烘皯甯�
+    */
+    @ValueTableShow
+    @ApiModelProperty("鎵撴浜烘皯甯�")
+    private BigDecimal money;
+    /**
+    * 鍛樺伐杩旂偣
+    */
+    @ValueTableShow
+    @ApiModelProperty("鍛樺伐杩旂偣")
+    private BigDecimal employeeRebate;
+    /**
+     * 鍛樺伐杩旂偣浜烘皯甯�
+     */
+    @ValueTableShow
+    @ApiModelProperty("鍛樺伐杩旂偣浜烘皯甯�")
+    private BigDecimal employeeRebateMoney;
     /**
      * 鍒涘缓鏃堕棿
      */
@@ -109,5 +115,7 @@
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
+    private Integer dataId;
+
 
 }

--
Gitblit v1.9.3