From dc5493c4e5ba0c044b285b6357ad17b7293f9b63 Mon Sep 17 00:00:00 2001
From: wayn <1669738430@qq.com>
Date: Thu, 20 Aug 2020 23:26:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E9=BB=98=E9=80=89=E4=B8=AD=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wayn/common/core/domain/shop/Goods.java   |  2 +-
 .../core/domain/shop/GoodsSpecification.java  |  6 ++++++
 .../common/core/domain/system/RoleMenu.java   |  2 +-
 .../common/core/domain/system/UserRole.java   |  2 ++
 .../mapper/shop/GoodsSpecificationMapper.xml  | 19 ++++++++++---------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Goods.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Goods.java
index 93cdcb3..fc7b967 100644
--- a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Goods.java
+++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Goods.java
@@ -100,7 +100,7 @@ public class Goods extends ShopBaseEntity implements Serializable {
     /**
      * 商品单位，例如件、盒
      */
-    @NotBlank(message = "商品所属类目不能为空")
+    @NotBlank(message = "商品单位不能为空")
     private String unit;
 
     /**
diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsSpecification.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsSpecification.java
index 5908edc..ab452cb 100644
--- a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsSpecification.java
+++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/GoodsSpecification.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
 public class GoodsSpecification extends ShopBaseEntity implements Serializable {
 
     private static final long serialVersionUID = 3623876658189050505L;
+
     @TableId(type = IdType.AUTO)
     private Long id;
 
@@ -48,6 +49,11 @@ public class GoodsSpecification extends ShopBaseEntity implements Serializable {
      */
     private String picUrl;
 
+    /**
+     * 是否默认选中（0代表选中 1代表未选中）
+     */
+    private Boolean defaultSelected;
+
     /**
      * 逻辑删除
      */
diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/system/RoleMenu.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/system/RoleMenu.java
index eeab236..7e5f97f 100644
--- a/waynboot-common/src/main/java/com/wayn/common/core/domain/system/RoleMenu.java
+++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/system/RoleMenu.java
@@ -1,6 +1,5 @@
 package com.wayn.common.core.domain.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -14,6 +13,7 @@ public class RoleMenu {
     /**
      * 角色ID
      */
+    @TableId
     private Long roleId;
 
     /**
diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/system/UserRole.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/system/UserRole.java
index fb888bd..134daa6 100644
--- a/waynboot-common/src/main/java/com/wayn/common/core/domain/system/UserRole.java
+++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/system/UserRole.java
@@ -1,5 +1,6 @@
 package com.wayn.common.core.domain.system;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ public class UserRole {
     /**
      * 用户ID
      */
+    @TableId
     private Long userId;
 
     /**
diff --git a/waynboot-common/src/main/resources/mapper/shop/GoodsSpecificationMapper.xml b/waynboot-common/src/main/resources/mapper/shop/GoodsSpecificationMapper.xml
index b1603c1..1ae23ea 100644
--- a/waynboot-common/src/main/resources/mapper/shop/GoodsSpecificationMapper.xml
+++ b/waynboot-common/src/main/resources/mapper/shop/GoodsSpecificationMapper.xml
@@ -4,20 +4,21 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.wayn.common.core.domain.shop.GoodsSpecification">
-        <result column="id" property="id" />
-        <result column="goods_id" property="goodsId" />
-        <result column="specification" property="specification" />
-        <result column="value" property="value" />
-        <result column="pic_url" property="picUrl" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="del_flag" property="delFlag" />
+        <result column="id"                     property="id" />
+        <result column="goods_id"               property="goodsId" />
+        <result column="specification"          property="specification" />
+        <result column="value"                  property="value" />
+        <result column="pic_url"                property="picUrl" />
+        <result column="create_time"            property="createTime" />
+        <result column="update_time"            property="updateTime" />
+        <result column="default_selected"       property="defaultSelected" />
+        <result column="del_flag"               property="delFlag" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
-        goods_id, specification, value, pic_url, create_time, update_time, del_flag
+        goods_id, specification, value, pic_url, create_time, update_time, default_selected, del_flag
     </sql>
 
 </mapper>