From 8aaffe80f14469a81d0c1c54a3a60908de66ce37 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 28 九月 2023 13:09:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java |  229 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 175 insertions(+), 54 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index d9631da..a47ce33 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,273 +14,393 @@
 
 /**
  * 璐圭敤鐢宠鏄庣粏瀵硅薄 service_funddetail_shared
- * 
+ *
  * @author ruoyi
  * @date 2023-04-20
  */
 @Data
 @ApiModel("璐圭敤鐢宠鏄庣粏")
-public class ServiceFunddetailShared extends BaseEntity
-{
+public class ServiceFunddetailShared extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 涓婚敭ID */
+    /**
+     * 涓婚敭ID
+     */
     @ApiModelProperty("涓婚敭ID")
     //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    /** 璧勯噾鐢宠涓昏〃ID */
+    /**
+     * 璧勯噾鐢宠涓昏〃ID
+     */
     @ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
     @Excel(name = "璧勯噾鐢宠涓昏〃ID")
     private Long fundid;
 
-    /** 瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID */
+    /**
+     * 瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID
+     */
     @ApiModelProperty("瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID")
     @Excel(name = "瀵瑰簲鐨剆ervice_funddetail琛ㄧ殑ID")
     private Long fdid;
 
-    /** 椤哄簭鍙� */
+    /**
+     * 椤哄簭鍙�
+     */
     @ApiModelProperty("椤哄簭鍙�")
     @Excel(name = "椤哄簭鍙�")
     private Integer orderno;
 
-    /** 椤圭洰ID */
+    /**
+     * 椤圭洰ID
+     */
     @ApiModelProperty("椤圭洰ID")
     @Excel(name = "椤圭洰ID")
     private Long itemid;
 
-    /** 璐圭敤椤圭洰鏍囧彿 */
+    /**
+     * 璐圭敤椤圭洰鏍囧彿
+     */
     @ApiModelProperty("璐圭敤椤圭洰鏍囧彿")
     @Excel(name = "璐圭敤椤圭洰鏍囧彿")
     private String itemcode;
 
-    /** 椤圭洰鍚嶇О */
+    /**
+     * 椤圭洰鍚嶇О
+     */
     @ApiModelProperty("椤圭洰鍚嶇О")
     @Excel(name = "椤圭洰鍚嶇О")
     private String itemname;
 
-    /** 椤圭洰绫诲埆 */
+    /**
+     * 椤圭洰绫诲埆
+     */
     @ApiModelProperty("椤圭洰绫诲埆")
     @Excel(name = "椤圭洰绫诲埆")
     private String itemtype;
 
-    /** 璧勯噾绫诲埆 */
+    /**
+     * 璧勯噾绫诲埆
+     */
     @ApiModelProperty("璧勯噾绫诲埆")
     @Excel(name = "璧勯噾绫诲埆")
     private String applytype;
 
-    /** 璧勯噾绫诲埆鍚嶇О */
+    /**
+     * 璧勯噾绫诲埆鍚嶇О
+     */
     @ApiModelProperty("璧勯噾绫诲埆鍚嶇О")
     @Excel(name = "璧勯噾绫诲埆鍚嶇О")
     private String applytypename;
 
-    /** 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹� */
+    /**
+     * 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�
+     */
     @ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
     @Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
     private String beneficiaryname;
 
-    /** 鏀剁泭浜虹紪鍙� */
+    /**
+     * 鏀剁泭浜虹紪鍙�
+     */
     @ApiModelProperty("鏀剁泭浜虹紪鍙�")
     @Excel(name = "鏀剁泭浜虹紪鍙�")
     private String beneficiaryno;
 
-    /** 闄勪欢琛� */
+    /**
+     * 闄勪欢琛�
+     */
     @ApiModelProperty("闄勪欢琛�")
     @Excel(name = "闄勪欢琛�")
     private String annexfiles;
 
-    /** 宸ヤ綔鍗曚綅 */
+    /**
+     * 宸ヤ綔鍗曚綅
+     */
     @ApiModelProperty("宸ヤ綔鍗曚綅")
     @Excel(name = "宸ヤ綔鍗曚綅")
     private String unitname;
 
-    /** 宸ヤ綔鍗曚綅缂栧彿 */
+    /**
+     * 宸ヤ綔鍗曚綅缂栧彿
+     */
     @ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
     @Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
     private String unitno;
 
-    /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+    /**
+     * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+     */
     @ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
     @Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
     private String unituserno;
 
-    /** 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle */
+    /**
+     * 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
+     */
     @ApiModelProperty("鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
     @Excel(name = "鑱岀О,瑙佸瓧鍏竤ys_professionaltitle")
     private String title;
 
-    /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+    /**
+     * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+     */
     @ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     @Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     private Long idcardtype;
 
-    /** 璇佷欢鍙风爜 */
+    /**
+     * 璇佷欢鍙风爜
+     */
     @ApiModelProperty("璇佷欢鍙风爜")
     @Excel(name = "璇佷欢鍙风爜")
     private String idcardno;
 
-    /** 鎬у埆 鏍规嵁瀛楀吀sys_user_sex */
+    /**
+     * 鎬у埆 鏍规嵁瀛楀吀sys_user_sex
+     */
     @ApiModelProperty("鎬у埆 鏍规嵁瀛楀吀sys_user_sex")
     @Excel(name = "鎬у埆 鏍规嵁瀛楀吀sys_user_sex")
     private String sex;
 
-    /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+    /**
+     * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+     */
     @ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
     @Excel(name = "涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
     private String familyrelations;
 
-    /** 鑱旂郴鐢佃瘽 */
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
     @ApiModelProperty("鑱旂郴鐢佃瘽")
     @Excel(name = "鑱旂郴鐢佃瘽")
     private String phone;
 
-    /** 寮�鎴烽摱琛� */
+    /**
+     * 寮�鎴烽摱琛�
+     */
     @ApiModelProperty("寮�鎴烽摱琛�")
     @Excel(name = "寮�鎴烽摱琛�")
     private String depositbank;
 
-    /** 鍗″彿 */
+    /**
+     * 鍗″彿
+     */
     @ApiModelProperty("鍗″彿")
     @Excel(name = "鍗″彿")
     private String bankcardno;
 
-    /** 鏀鍚嶇О */
+    /**
+     * 鏀鍚嶇О
+     */
     @ApiModelProperty("鏀鍚嶇О")
     @Excel(name = "鏀鍚嶇О")
     private String branchbankname;
 
-    /** 閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+    /**
+     * 閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+     */
     @ApiModelProperty("閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     @Excel(name = "閾惰鍗$収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     private String annexbankcard;
 
-    /** 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+    /**
+     * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+     */
     @ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     @Excel(name = "鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
     private String annexregistform;
 
-    /** 鏁伴噺 */
+    /**
+     * 鏁伴噺
+     */
     @ApiModelProperty("鏁伴噺")
     @Excel(name = "鏁伴噺")
     private Double quantity;
 
-    /** 浠锋牸 */
+    /**
+     * 浠锋牸
+     */
     @ApiModelProperty("浠锋牸")
     @Excel(name = "浠锋牸")
     private Double price;
 
-    /** 鐢宠閲戦 */
+    /**
+     * 鐢宠閲戦
+     */
     @ApiModelProperty("鐢宠閲戦")
     @Excel(name = "鐢宠閲戦")
     private Double amount;
 
-    /** 鎵g◣閲戦 */
+    /**
+     * 鎵g◣閲戦
+     */
     @ApiModelProperty("鎵g◣閲戦")
     @Excel(name = "鎵g◣閲戦")
     private Double taxamount;
 
-    /** 绋庡悗閲戦 */
+    /**
+     * 绋庡悗閲戦
+     */
     @ApiModelProperty("绋庡悗閲戦")
     @Excel(name = "绋庡悗閲戦")
     private Double taxedamount;
 
-    /** 棰勬敮閲戦 */
+    /**
+     * 棰勬敮閲戦
+     */
     @ApiModelProperty("棰勬敮閲戦")
     @Excel(name = "棰勬敮閲戦")
     private Double prepaidamount;
 
-    /** 浠樻閲戦 */
+    /**
+     * 浠樻閲戦
+     */
     @ApiModelProperty("浠樻閲戦")
     @Excel(name = "浠樻閲戦")
     private Double paidamount;
 
-    /** 浠樻鏃堕棿 */
+    /**
+     * 浠樻鏃堕棿
+     */
     @ApiModelProperty("浠樻鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "浠樻鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date paidtime;
 
-    /** 浠樻鏂瑰紡 */
+    /**
+     * 浠樻鏂瑰紡
+     */
     @ApiModelProperty("浠樻鏂瑰紡")
     @Excel(name = "浠樻鏂瑰紡")
     private String payterm;
 
-    /** 鍙戠エ寮犳暟 */
+    /**
+     * 鍙戠エ寮犳暟
+     */
     @ApiModelProperty("鍙戠エ寮犳暟")
     @Excel(name = "鍙戠エ寮犳暟")
     private Long invoicecount;
 
-    /** 闄勪欢寮犳暟 */
+    /**
+     * 闄勪欢寮犳暟
+     */
     @ApiModelProperty("闄勪欢寮犳暟")
     @Excel(name = "闄勪欢寮犳暟")
     private Long attachcount;
 
-    /** 鎹愮尞ID */
+    /**
+     * 鎹愮尞ID
+     */
     @ApiModelProperty("鎹愮尞ID")
     @Excel(name = "鎹愮尞ID")
     private Long infoid;
 
-    /** 鎹愮尞缂栧彿 */
+    /**
+     * 鎹愮尞缂栧彿
+     */
     @ApiModelProperty("鎹愮尞缂栧彿")
     @Excel(name = "鎹愮尞缂栧彿")
     private String donorno;
 
-    /** 鎹愮尞鑰呭鍚� */
+    /**
+     * 鎹愮尞鑰呭鍚�
+     */
     @ApiModelProperty("鎹愮尞鑰呭鍚�")
     @Excel(name = "鎹愮尞鑰呭鍚�")
     private String donorname;
 
-    /** 璁板綍鐘舵�� */
+    /**
+     * 璁板綍鐘舵��
+     */
     @ApiModelProperty("璁板綍鐘舵��")
     @Excel(name = "璁板綍鐘舵��")
     private String recordstatus;
 
-    /** 涓婁紶鏍囧織 */
+    /**
+     * 涓婁紶鏍囧織
+     */
     @ApiModelProperty("涓婁紶鏍囧織")
     @Excel(name = "涓婁紶鏍囧織")
     private String uploadflag;
 
-    /** 涓婁紶鏃堕棿 */
+    /**
+     * 涓婁紶鏃堕棿
+     */
     @ApiModelProperty("涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date uploadtime;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private String servicesscope;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private String servicesscopename;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private String servicetype;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private String servicetypename;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private Double reimbursementamount;
 
-    /** 閲戦 */
+    /**
+     * 閲戦
+     */
     @ApiModelProperty("閲戦")
     @Excel(name = "閲戦")
     private String jine;
 
-    /** 鐞嗙敱 */
+    /**
+     * 鐞嗙敱
+     */
     @ApiModelProperty("鐞嗙敱")
     @Excel(name = "鐞嗙敱")
     private String liyou;
 
+    /**
+     * 璁$畻绋庤垂鏃堕棿
+     */
+    @ApiModelProperty("璁$畻绋庤垂鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taxTime;
+
+    /**
+     * 缁╂晥鏃ユ湡
+     */
+    @ApiModelProperty("缁╂晥鏃ユ湡")
+    private String jxrq;
+
+    /**
+     * 椤圭洰鍚嶇О璇存槑
+     */
+    @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+    private String itemdescribe;
+
 }
 

--
Gitblit v1.9.3