From c017a38ce24bfae8e9d1729210da8511ba85d29e Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 16 十二月 2024 18:03:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java index 880312c..3e67c87 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java @@ -11,6 +11,7 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * <p> @@ -124,5 +125,8 @@ @TableField("bound_shop_superiors_points") private Integer boundShopSuperiorsPoints; + @TableField(exist = false) + private List<GoodsArea> goodsAreaList; + } -- Gitblit v1.7.1