From d51450c60f95c7e6fb7034451e9c1f7497b2b116 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 31 八月 2023 17:38:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java |  167 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
index 6f1a801..6b4598d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
@@ -14,193 +14,264 @@
 
 /**
  * 鎶ラ攢鐢宠瀵硅薄鍏ュ弬瀵硅薄
- * 
+ *
  * @author 鍒樼渷
  * @date 2023-04-28
  */
 @Data
 @ApiModel("鎶ラ攢鐢宠鍏ュ弬EO")
-public class ServiceReimbursementEo extends BaseEntity
-{
+public class ServiceReimbursementEo extends BaseEntity {
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    /** 鎶ラ攢浜虹紪鍙� */
+    /**
+     * 鎶ラ攢浜虹紪鍙�
+     */
     @ApiModelProperty("鎶ラ攢浜虹紪鍙�")
     @Excel(name = "鎶ラ攢浜虹紪鍙�")
     private String userno;
 
-    /** 鎶ラ攢浜哄鍚� */
+    /**
+     * 鎶ラ攢浜哄鍚�
+     */
     @ApiModelProperty("鎶ラ攢浜哄鍚�")
     @Excel(name = "鎶ラ攢浜哄鍚�")
     private String username;
 
-    /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+    /**
+     * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+     */
     @ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     @Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
     private String idcardtype;
 
-    /** 璇佷欢鍙风爜 */
+    /**
+     * 璇佷欢鍙风爜
+     */
     @ApiModelProperty("璇佷欢鍙风爜")
     @Excel(name = "璇佷欢鍙风爜")
     private String idcardno;
 
-    /** 鑱旂郴鐢佃瘽 */
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
     @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 annexfiles;
 
-    /** 鐢宠閲戦 */
+    /**
+     * 鐢宠閲戦
+     */
     @ApiModelProperty("鐢宠閲戦")
     @Excel(name = "鐢宠閲戦")
     private BigDecimal amountrequested;
 
-    /** 浜ら�氳垂 */
+    /**
+     * 浜ら�氳垂
+     */
     @ApiModelProperty("浜ら�氳垂")
     @Excel(name = "浜ら�氳垂")
     private BigDecimal trafficexpense;
 
-    /** 浣忓璐� */
+    /**
+     * 浣忓璐�
+     */
     @ApiModelProperty("浣忓璐�")
     @Excel(name = "浣忓璐�")
     private BigDecimal hotelexpense;
 
-    /** 浼欓璐� */
+    /**
+     * 浼欓璐�
+     */
     @ApiModelProperty("浼欓璐�")
     @Excel(name = "浼欓璐�")
     private BigDecimal foodexpenses;
 
-    /** 浼欓璐硅ˉ鍔� */
+    /**
+     * 浼欓璐硅ˉ鍔�
+     */
     @ApiModelProperty("浼欓璐硅ˉ鍔�")
     @Excel(name = "浼欓璐硅ˉ鍔�")
     private BigDecimal foodallowance;
 
-    /** 鏉傝垂 */
+    /**
+     * 鏉傝垂
+     */
     @ApiModelProperty("鏉傝垂")
     @Excel(name = "鏉傝垂")
     private BigDecimal otherexpense;
 
-    /** 鍏朵粬璐圭敤閲戦 */
+    /**
+     * 鍏朵粬璐圭敤閲戦
+     */
     @ApiModelProperty("鍏朵粬璐圭敤閲戦")
     @Excel(name = "鍏朵粬璐圭敤閲戦")
     private BigDecimal otherfeeamount;
 
 
-    /** 棰勬敮璐圭敤 */
+    /**
+     * 棰勬敮璐圭敤
+     */
     @ApiModelProperty("棰勬敮璐圭敤")
     @Excel(name = "棰勬敮璐圭敤")
     private Double prepaidamount;
 
-    /** 鍙戠エ寮犳暟 */
+    /**
+     * 鍙戠エ寮犳暟
+     */
     @ApiModelProperty("鍙戠エ寮犳暟")
     @Excel(name = "鍙戠エ寮犳暟")
     private Long invoicecount;
 
-    /** 闄勪欢鏁� */
+    /**
+     * 闄勪欢鏁�
+     */
     @ApiModelProperty("闄勪欢鏁�")
     @Excel(name = "闄勪欢鏁�")
     private Long attachcount;
 
-    /** 閮ㄩ棬涓荤宸ュ彿 */
+    /**
+     * 閮ㄩ棬涓荤宸ュ彿
+     */
     @ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
     @Excel(name = "閮ㄩ棬涓荤宸ュ彿")
     private String managerno;
 
-    /** 閮ㄩ棬涓荤鍚嶅瓧 */
+    /**
+     * 閮ㄩ棬涓荤鍚嶅瓧
+     */
     @ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
     @Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
     private String managername;
 
-    /** 閮ㄩ棬缂栧彿 */
+    /**
+     * 閮ㄩ棬缂栧彿
+     */
     @ApiModelProperty("閮ㄩ棬缂栧彿")
     @Excel(name = "閮ㄩ棬缂栧彿")
     private String deptmentno;
 
-    /** 閮ㄩ棬鍚嶇О */
+    /**
+     * 閮ㄩ棬鍚嶇О
+     */
     @ApiModelProperty("閮ㄩ棬鍚嶇О")
     @Excel(name = "閮ㄩ棬鍚嶇О")
     private String deptmentname;
 
-    /** 涓績绛惧瓧 */
+    /**
+     * 涓績绛惧瓧
+     */
     @ApiModelProperty("涓績绛惧瓧")
     @Excel(name = "涓績绛惧瓧")
     private String opochecker;
 
-    /** 璐㈠姟鍓櫌闀跨瀛� */
+    /**
+     * 璐㈠姟鍓櫌闀跨瀛�
+     */
     @ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
     @Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
     private String finvicepresident;
 
-    /** 涓氬姟鍓櫌闀跨瀛� */
+    /**
+     * 涓氬姟鍓櫌闀跨瀛�
+     */
     @ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
     @Excel(name = "涓氬姟鍓櫌闀跨瀛�")
     private String busvicepresident;
 
-    /** 鍔炲叕瀹や富浠荤瀛� */
+    /**
+     * 鍔炲叕瀹や富浠荤瀛�
+     */
     @ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
     @Excel(name = "鍔炲叕瀹や富浠荤瀛�")
     private String officedirector;
 
-    /** 璐㈠姟瀹や富浠荤瀛� */
+    /**
+     * 璐㈠姟瀹や富浠荤瀛�
+     */
     @ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
     @Excel(name = "璐㈠姟瀹や富浠荤瀛�")
     private String financedirector;
 
-    /** 璐㈠姟瀹℃牳 */
+    /**
+     * 璐㈠姟瀹℃牳
+     */
     @ApiModelProperty("璐㈠姟瀹℃牳")
     @Excel(name = "璐㈠姟瀹℃牳")
     private String financechecher;
 
-    /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+    /**
+     * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+     */
     @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
     @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
     private Long infoid;
 
-    /** 鎹愮尞鑰呯紪鍙� */
+    /**
+     * 鎹愮尞鑰呯紪鍙�
+     */
     @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
     @Excel(name = "鎹愮尞鑰呯紪鍙�")
     private String donorno;
 
-    /** 璁板綍鐘舵�� */
+    /**
+     * 璁板綍鐘舵��
+     */
     @ApiModelProperty("璁板綍鐘舵��")
     @Excel(name = "璁板綍鐘舵��")
     private Integer 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")
@@ -222,22 +293,30 @@
     @ApiModelProperty("鎬婚噾棰濈殑澶у啓")
     private String bigstrmoney;
 
-    /** 闄勪欢鍦板潃锛宎dd by yangjb 20221124 */
+    /**
+     * 闄勪欢鍦板潃锛宎dd by yangjb 20221124
+     */
     @ApiModelProperty("闄勪欢鍦板潃")
     private String fileurl;
 
     private String remark;
 
-    /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+    /**
+     * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+     */
     @ApiModelProperty("褰撳墠瀹℃牳绾у埆")
     private Long flowlevel;
 
 
-    /** 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+    /**
+     * 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�
+     */
     @ApiModelProperty("璐圭敤褰掑睘")
     private String persontype;
 
-    /** 璐圭敤褰掑睘鎻忚堪 */
+    /**
+     * 璐圭敤褰掑睘鎻忚堪
+     */
     @ApiModelProperty("璐圭敤褰掑睘鎻忚堪")
     private String costtypename;
 
@@ -266,5 +345,7 @@
     @ApiModelProperty("鐢宠鏃堕棿")
     private Date endtime;
 
+    @ApiModelProperty("涓嬭浇缂栧彿")
+    private String bh;
 }
 

--
Gitblit v1.9.3