From 58a94ac62e49156d1b54735808896ab9df69fe86 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 08 十二月 2023 15:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
index 4966ac3..904ccfe 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
@@ -1,7 +1,8 @@
package com.consum.base.pojo.response;
-import io.swagger.annotations.ApiModel;
import java.util.List;
+
+import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
@@ -33,12 +34,10 @@
private Long dealTime;
-
private Integer states;
-
/**
* 瑙勬牸鍨嬪彿
*/
- private List<FromTransferTemplateInfoVO> goodTemplateInfo;
+ private List<GoodsTemplateCountVO> goodTemplateInfo;
}
--
Gitblit v1.9.1