From d3dfc07c93ae97cc6a301d9ccf2f8513a6a8ad85 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
index 067f8bc..7e66c22 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
@@ -2,9 +2,6 @@
import java.math.BigDecimal;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,7 +15,7 @@
* 宸梾鎶ラ攢浠樻淇℃伅瀵硅薄 service_reimbursementpayee
*
* @author ruoyi
- * @date 2023-04-20
+ * @date 2023-05-10
*/
@Data
@ApiModel("宸梾鎶ラ攢浠樻淇℃伅")
@@ -30,7 +27,7 @@
@ApiModelProperty("涓婚敭ID")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
- private Long id;
+ private String id;
/** 璧勯噾鐢宠涓昏〃ID */
@ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
@@ -72,10 +69,6 @@
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 澶囨敞 */
- @ApiModelProperty("澶囨敞")
- private String remark;
-
/** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
@ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
@Excel(name = "涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
@@ -83,8 +76,8 @@
/** 浠樻鏃ユ湡 */
@ApiModelProperty("浠樻鏃ユ湡")
- @TableField(fill = FieldFill.DEFAULT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date paiddate;
/** 涓婁紶鏍囧織 */
--
Gitblit v1.9.3