Merge branch 'feat-dingwf' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/ProductCategoryEntity.java

@@ -14,17 +14,17 @@ import javax.persistence.*;
 @Entity
 @Entity
 @Data
 @Data
 @Table(name="product_category")
 @Table(name="product_category")
-public class ProductCategoryEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class ProductCategoryEntity {
 
 
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
     /**
     /**
      * 小组id
      * 小组id
      */
      */
-    @Column(name="product_service_id")
-    private Long productServiceId;
+    @Column(name="product_category_id")
+    private String productCategoryId;
 
 
     /**
     /**
      * 品牌
      * 品牌

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/ProductServiceImpl.java

@@ -36,7 +36,7 @@ public class ProductServiceImpl implements ProductService {
         for (ProductCategoryEntity e : productCategoryDao.findAll()) {
         for (ProductCategoryEntity e : productCategoryDao.findAll()) {
             String brand = e.getBrand();
             String brand = e.getBrand();
             String text = String.format("%s-%s", e.getType(), e.getSkill());
             String text = String.format("%s-%s", e.getType(), e.getSkill());
-            KeyValueDTO categoryDto = new KeyValueDTO().setLabel(text).setValue(e.getProductServiceId().toString());
+            KeyValueDTO categoryDto = new KeyValueDTO().setLabel(text).setValue(e.getProductCategoryId());
             if (brandMap.containsKey(brand)) {
             if (brandMap.containsKey(brand)) {
                 brandMap.get(brand).getCategories().add(categoryDto);
                 brandMap.get(brand).getCategories().add(categoryDto);
             } else {
             } else {