From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 03 九月 2024 16:52:49 +0800 Subject: [PATCH] 代码提交 bug解决 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java index b494928..795f1a6 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java @@ -2,33 +2,52 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data +@ApiModel(value = "仓库管理入库1", description = "仓库管理入库1") public class SupplierVolumeProductionRkglVO { + + private Long id; + @ApiModelProperty("用户名称") + @JsonInclude(JsonInclude.Include.ALWAYS) private String nickName; @ApiModelProperty(name = "手机号码") + @JsonInclude(JsonInclude.Include.ALWAYS) private String phonenumber; - @TableId("id") - private Integer id; + @ApiModelProperty("发起人ID") + private Long sysId; + + @ApiModelProperty("仓库名称") + @JsonInclude(JsonInclude.Include.ALWAYS) private String storeManagementName; @ApiModelProperty("发起时间") + @JsonInclude(JsonInclude.Include.ALWAYS) private Date startiTime; @ApiModelProperty("供应商id") - private Integer supplierId; + @JsonInclude(JsonInclude.Include.ALWAYS) + private Long supplierId; @ApiModelProperty("仓库ID") - @TableField("management_id") private Long managementId; + @ApiModelProperty("结束时间") + private Date endTime; + @ApiModelProperty("1.待审核,2 已拒绝,3 审核通过,4 已完成,5 已取消") + private Integer presentState; + + @ApiModelProperty("1 待管理员审核,2 待主管审核,3 待主任审核,4 待入库,5 待从重新提交, 6已完成, 7,已取消") + private Integer auditStatus; } -- Gitblit v1.7.1