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

topsun-xt/src/main/resources/application.properties

@@ -16,6 +16,8 @@ log.db.password=123456
 
 shiro.host=127.0.0.1
 shiro.port=6379
+#shiro.host=192.168.222.122
+#shiro.port=6401
 shiro.expire=1800000
 
 system.dataSource=dataSource
@@ -43,7 +45,7 @@ shiro.ldap.systemPassword=123456
 shiro.ldap.userDnTemplate={0}@dev.huigou.com
 
 #email
-tech.email.enable=true
+tech.email.enable=false
 tech.email.host=smtp.qq.com
 tech.email.username=1650842865@qq.com
 tech.email.password=pfkkokowbrokdfdc

topsun/src/main/java/com/huigou/topsun/product/domain/SizeGroup.java

+package com.huigou.topsun.product.domain;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+/**
+ * 尺码组主表
+ * @TableName size_group
+ */
+@Table(name="size_group")
+@Data
+public class SizeGroup implements Serializable {
+    /**
+     * 尺码组id
+     */
+    @Id
+    @GeneratedValue(generator = "system-uuid")
+    @GenericGenerator(name = "system-uuid", strategy = "guid")
+    @Column(name = "size_group_id")
+    private String sizeGroupId;
+
+    /**
+     * 尺码组名称
+     */
+    @Column(name = "size_group_name")
+    private String sizeGroupName;
+
+    /**
+     * 尺码组编码
+     */
+    @Column(name = "size_group_code")
+    private String sizeGroupCode;
+
+    /**
+     * 尺码组类型
+     */
+    @Column(name = "size_group_type")
+    private String sizeGroupType;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file