From 7a1b2baf3546f62f27327f5d4209ab4311069abc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 24 五月 2023 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java b/src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java
index 60a4be1..6cd6867 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java
@@ -13,5 +13,5 @@
     private Integer danger;
     @ApiModelProperty("是否超重 0否 1是")
     private Integer weight;
-    private List<GoodsDto> list;
+    private List<TGoods> list;
 }

--
Gitblit v1.7.1