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

# Conflicts:
#	topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java

topsun-xt/src/main/webapp/biz/topsun/product/sizeGroup.js

@@ -23,7 +23,34 @@ function loadSizeGroupListGrid() {
         },
         deleteHandler: deleteHandler,
     });
-
-
-
+    gridManager = UICtrl.grid("#sizeGroupListGrid", {
+        columns: [
+            {display: "尺码组编码", name: "sizeGroupCode", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "尺码组名称", name: "sizeGroupName", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "SIZR类型", name: "sizeGroupType", width: 120, minWidth: 60, type: "string", align: "left"},
+            {
+                display: "创建人",
+                name: "createdByName",
+                width: 100,
+                minWidth: 60,
+                type: "string",
+                align: "left"
+            },
+        ],
+        dataAction: "server",
+        url: web_app.name + '/technology/slicedTechnologyList.ajax',
+        pageSize: 20,
+        usePager: true,
+        toolbar: toolbarOptions,
+        width: "100%",
+        height: "100%",
+        heightDiff: -8,
+        checkbox: true,
+        fixedCellHeight: true,
+        selectRowButtonOnly: true,
+        onDblClickRow: function (data, rowindex, rowobj) {
+            updateHandler(data);
+        }
+    });
+    UICtrl.setSearchAreaToggle(gridManager);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/product/application/impl/SizeGroupApplicationImpl.java

@@ -4,13 +4,12 @@ import com.huigou.cache.DictUtil;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.product.application.SizeGroupApplication;
-import com.huigou.topsun.product.domain.SizeGroup;
 import com.huigou.topsun.product.domain.query.SizeGroupQueryRequest;
 import com.huigou.topsun.product.repository.SizeGroupItemRepository;
 import com.huigou.topsun.product.repository.SizeGroupRepository;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
 
 import java.util.Map;
 
@@ -23,7 +22,10 @@ import java.util.Map;
 @Service
 public class SizeGroupApplicationImpl extends BaseApplication implements SizeGroupApplication {
 
+    @Autowired
     private SizeGroupRepository sizeGroupRepository;
+
+    @Autowired
     private SizeGroupItemRepository sizeGroupItemRepository;
 
     @Override

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.GenericGenerator;
 @Table(name="size_group")
 @Entity
 @Data
+@Entity
 public class SizeGroup implements Serializable {
     /**
      * 尺码组id

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.GenericGenerator;
 @Table(name="size_group_item")
 @Entity
 @Data
+@Entity
 public class SizeGroupItem implements Serializable {
     /**
      * 尺码id