diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java index b5b37d7bf..5f7f99531 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java @@ -33,7 +33,7 @@ private static final long serialVersionUID=1L; /** ID */ - @TableId(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; /** 商户名称 */ diff --git a/ruoyi-ui/src/views/goods/goods_main/index.vue b/ruoyi-ui/src/views/goods/goods_main/index.vue index ad804a015..74f7b235e 100644 --- a/ruoyi-ui/src/views/goods/goods_main/index.vue +++ b/ruoyi-ui/src/views/goods/goods_main/index.vue @@ -152,6 +152,9 @@ + + + @@ -257,6 +260,7 @@ export default { goodsDesc: undefined, goodsFaceImg: undefined, goodsImg: undefined, + goodsPrice: undefined, state: undefined }, // 表单参数 @@ -328,6 +332,7 @@ export default { goodsDesc: undefined, goodsFaceImg: undefined, goodsImg: undefined, + goodsPrice: undefined, createBy: undefined, createTime: undefined, updateBy: undefined, diff --git a/ruoyi-ui/src/views/winery/merchant/index.vue b/ruoyi-ui/src/views/winery/merchant/index.vue index 74e8979a7..236b83b64 100644 --- a/ruoyi-ui/src/views/winery/merchant/index.vue +++ b/ruoyi-ui/src/views/winery/merchant/index.vue @@ -90,8 +90,12 @@ - - + + + +