From 22db0b6b9b3a5905c1793107c2c1c2a00b265091 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei121@163.com>
Date: 星期四, 16 三月 2023 08:59:28 +0800
Subject: [PATCH] 批次改为工单，完善docker配置文件
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
index cd6a4b6..2ac9388 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
@@ -8,23 +8,25 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
+import java.util.List;
+
@Data
@ToString
public class DryOrderVo {
/**id*/
@ApiModelProperty(value = "id")
- private Integer id;
- /**鎵规鏃堕棿*/
+ private String id;
+ /**宸ュ崟鏃堕棿*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鎵规鏃堕棿", example = "2023-03-01 12:11:10")
+ @ApiModelProperty(value = "宸ュ崟鏃堕棿", example = "2023-03-01 12:11:10")
private Date orderTime;
- /**鎵规鍙�*/
- @ApiModelProperty(value = "鎵规鍙�", example = "202303011211")
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�", example = "202303011211")
private String code;
/**鑽潗*/
@ApiModelProperty(value = "鑽潗", example = "1085571074")
- private Integer herbId;
+ private String herbId;
/**鍒濆鍚按鐜�*/
@ApiModelProperty(value = "鍒濆鍚按鐜�", example = "75.51")
private Double initial;
@@ -47,19 +49,23 @@
@ApiModelProperty(value = "棰勮鍓╀綑鏃堕棿")
private Integer remain;
/**璁惧*/
- @ApiModelProperty(value = "璁惧", example = "")
- private Integer equId;
+ @ApiModelProperty(value = "璁惧", example = "S1001")
+ private String equId;
/**杞﹂棿*/
- @ApiModelProperty(value = "杞﹂棿")
- private Integer shopId;
+ @ApiModelProperty(value = "杞﹂棿", example = "S1")
+ private String shopId;
/**绉熸埛id*/
- @ApiModelProperty(value = "绉熸埛id")
+ @ApiModelProperty(value = "绉熸埛id", example = "1000")
private Integer tenantId;
- /**鎵规鐘舵��*/
- @ApiModelProperty(value = "鎵规鐘舵��")
- private Integer orderStatus;
+ /**宸ュ崟鐘舵��*/
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
+ private String orderStatus;
/**鎿嶄綔浜�*/
- @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+
@ApiModelProperty(value = "鎿嶄綔浜�")
private String operator;
+
+
+ @ApiModelProperty(value = "瀹炴椂鏄庣粏鏁版嵁")
+ private List<DryOrderTrendVo> DetailList;
}
--
Gitblit v1.9.3