Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java

@@ -108,8 +108,8 @@ public class LoginProperties {
         @Override
         protected char[] alphas() {
             // 生成随机数字和运算符
-//            int n1 = num(1, 10), n2 = num(1, 10);
-            int n1 = num(1, 5), n2 = num(1, 5);
+            int n1 = num(1, 10), n2 = num(1, 10);
+//            int n1 = num(1, 5), n2 = num(1, 5);
             int opt = num(3);
 
             // 计算结果

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TagProductDepts.java

@@ -2,6 +2,8 @@ package cn.ysk.cashier.mybatis.entity;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -12,6 +14,7 @@ import java.io.Serializable;
 @SuppressWarnings("serial")
 public class TagProductDepts extends Model<TagProductDepts> {
     //标签id
+    @TableId(value = "tagId", type = IdType.NONE)
     private Integer tagId;
     //商品id
     private Integer productId;