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/response/LWhFormOutputExtendVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
index 5c03d48..f877748 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormOutputExtendVO.java
@@ -44,7 +44,7 @@
     private Long dealTime;
 
     // 鍑哄簱鎵嬬画
-    private Long doc;
+    private String doc;
 
-    private List<FormOutputGoodsVO> fromOutputGoods;
+    private List<GoodsTemplateInfoVO> fromOutputGoods;
 }

--
Gitblit v1.9.1