From e2db1aee94ab93365b846f3856a5e8928efca328 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 10:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
index 462c83e..4d2e391 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/LWhFormOutputQry.java
@@ -1,6 +1,5 @@
package com.consum.base.pojo.query;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,7 +29,23 @@
* 鐗╁搧妯＄増鍚嶇О
*/
@ApiModelProperty(value = "鐗╁搧妯＄増鍚嶇О")
- private String goodsTemplateName;
+ private String goodsTempName;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╁搧妯＄増id")
+ private String goodsTemplateId;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╁搧妯＄増鍚嶇О")
+ private String goodsName;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╁搧妯＄増id")
+ private String baseGoodsId;
+
/**
* 鏈烘瀯
*/
@@ -42,22 +57,29 @@
@ApiModelProperty(value = "鍒涘缓浜�")
private String createName;
/**
- * 1=寰呭叆搴擄紱2=宸插叆搴�
+ * 閲囪喘鍏ュ簱 map.put("1" + "1", "1")
+ * 璋冩嫧鍏ュ簱 map.put("2" + "1", "2")
+ * 璋冩嫧鍑哄簱 map.put("2" + "2", "3")
+ * 鍏朵粬鍑哄簱 map.put("3" + "1", "4")
+ * 鍏朵粬鍑哄簱 map.put("3" + "2", "5")
+ * 閫�杩樺叆搴� map.put("4" + "1", "6")
+ * 鐢抽鍑哄簱 map.put("4" + "2", "7")
*/
- @ApiModelProperty(value = "1=寰呭叆搴擄紱2=宸插叆搴�")
+ @ApiModelProperty(value = "1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱")
+ private Integer flowType;
+
+ @ApiModelProperty(value = "鐘舵��")
private Integer states;
/**
* 鍏ュ簱鏃堕棿 寮�濮�
*/
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
private Long startTime;
/**
* 鍏ュ簱鏃堕棿 缁撴潫
*/
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyyMMdd", timezone = "GMT+8")
private Long endTime;
/**
* 瑙勬牸鍨嬪彿id
--
Gitblit v1.9.1