Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of…

Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/entities/dto/product/pointsmall/IntegralProductType.java

@@ -59,7 +59,7 @@ public class IntegralProductType {
     private Integer levelType;
 
 //    @ApiModelProperty(value = "会员等级列表")
-    private List<String> levelList;
+//    private List<Object> levelList;
 
 //    @ApiModelProperty(value = "商品排序值")
     private Integer sequence;