From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期四, 29 五月 2025 22:31:33 +0800 Subject: [PATCH] 修改bug --- ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java index a4e89d8..c9c09f2 100644 --- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java +++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,6 +39,10 @@ @TableField("site_id") private Integer siteId; + @ApiModelProperty(value = "申请人id") + @TableField("user_id") + private Long userId; + @ApiModelProperty(value = "策略名称") @TableField("name") private String name; @@ -50,5 +55,38 @@ @TableField("discount") private BigDecimal discount; + @ApiModelProperty(value = "一级审核用户id") + @TableField("first_user_id") + private Long firstUserId; + + @ApiModelProperty(value = "二级审核用户id") + @TableField("two_user_id") + private Long twoUserId; + + @ApiModelProperty(value = "一级审核备注") + @TableField("first_remark") + private String firstRemark; + + @ApiModelProperty(value = "二级审核备注") + @TableField("two_remark") + private String twoRemark; + + @ApiModelProperty(value = "审核状态(1=待审核一级,2=待审核二级,3=审核通过,4=驳回)") + @TableField("audit_status") + private Integer auditStatus; + + @ApiModelProperty(value = "一级审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("first_audit_time") + private LocalDateTime firstAuditTime; + + @ApiModelProperty(value = "二级审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("two_audit_time") + private LocalDateTime twoAuditTime; + + @ApiModelProperty(value = "父级id 上一次已审核通过的id 为空则代表是新增,或者本次数据状态审核中或已拒绝") + @TableField("parent_id") + private Integer parentId; } -- Gitblit v1.7.1