Maven依赖版本升级

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSettingExample.java

@@ -11,7 +11,7 @@ public class OmsOrderSettingExample {
     protected List<Criteria> oredCriteria;
 
     public OmsOrderSettingExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class OmsOrderSettingExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -466,7 +466,6 @@ public class OmsOrderSettingExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumExample.java

@@ -11,7 +11,7 @@ public class PmsAlbumExample {
     protected List<Criteria> oredCriteria;
 
     public PmsAlbumExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsAlbumExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -496,7 +496,6 @@ public class PmsAlbumExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPicExample.java

@@ -11,7 +11,7 @@ public class PmsAlbumPicExample {
     protected List<Criteria> oredCriteria;
 
     public PmsAlbumPicExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsAlbumPicExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -296,7 +296,6 @@ public class PmsAlbumPicExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsBrandExample.java

@@ -11,7 +11,7 @@ public class PmsBrandExample {
     protected List<Criteria> oredCriteria;
 
     public PmsBrandExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsBrandExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -746,7 +746,6 @@ public class PmsBrandExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsCommentExample.java

@@ -12,7 +12,7 @@ public class PmsCommentExample {
     protected List<Criteria> oredCriteria;
 
     public PmsCommentExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsCommentExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -1007,7 +1007,6 @@ public class PmsCommentExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplayExample.java

@@ -12,7 +12,7 @@ public class PmsCommentReplayExample {
     protected List<Criteria> oredCriteria;
 
     public PmsCommentReplayExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsCommentReplayExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -557,7 +557,6 @@ public class PmsCommentReplayExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplateExample.java

@@ -12,7 +12,7 @@ public class PmsFeightTemplateExample {
     protected List<Criteria> oredCriteria;
 
     public PmsFeightTemplateExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsFeightTemplateExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -607,7 +607,6 @@ public class PmsFeightTemplateExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPriceExample.java

@@ -12,7 +12,7 @@ public class PmsMemberPriceExample {
     protected List<Criteria> oredCriteria;
 
     public PmsMemberPriceExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsMemberPriceExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -417,7 +417,6 @@ public class PmsMemberPriceExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategoryExample.java

@@ -11,7 +11,7 @@ public class PmsProductAttributeCategoryExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductAttributeCategoryExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsProductAttributeCategoryExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -356,7 +356,6 @@ public class PmsProductAttributeCategoryExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeExample.java

@@ -11,7 +11,7 @@ public class PmsProductAttributeExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductAttributeExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsProductAttributeExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -846,7 +846,6 @@ public class PmsProductAttributeExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValueExample.java

@@ -11,7 +11,7 @@ public class PmsProductAttributeValueExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductAttributeValueExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsProductAttributeValueExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -356,7 +356,6 @@ public class PmsProductAttributeValueExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelationExample.java

@@ -11,7 +11,7 @@ public class PmsProductCategoryAttributeRelationExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductCategoryAttributeRelationExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsProductCategoryAttributeRelationExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -286,7 +286,6 @@ public class PmsProductCategoryAttributeRelationExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryExample.java

@@ -11,7 +11,7 @@ public class PmsProductCategoryExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductCategoryExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class PmsProductCategoryExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -806,7 +806,6 @@ public class PmsProductCategoryExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java

@@ -13,7 +13,7 @@ public class PmsProductExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class PmsProductExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -2508,7 +2508,6 @@ public class PmsProductExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReductionExample.java

@@ -12,7 +12,7 @@ public class PmsProductFullReductionExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductFullReductionExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsProductFullReductionExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -347,7 +347,6 @@ public class PmsProductFullReductionExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadderExample.java

@@ -12,7 +12,7 @@ public class PmsProductLadderExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductLadderExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsProductLadderExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -407,7 +407,6 @@ public class PmsProductLadderExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLogExample.java

@@ -13,7 +13,7 @@ public class PmsProductOperateLogExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductOperateLogExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class PmsProductOperateLogExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -838,7 +838,6 @@ public class PmsProductOperateLogExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecordExample.java

@@ -12,7 +12,7 @@ public class PmsProductVertifyRecordExample {
     protected List<Criteria> oredCriteria;
 
     public PmsProductVertifyRecordExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsProductVertifyRecordExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -487,7 +487,6 @@ public class PmsProductVertifyRecordExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java

@@ -12,7 +12,7 @@ public class PmsSkuStockExample {
     protected List<Criteria> oredCriteria;
 
     public PmsSkuStockExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -69,7 +69,7 @@ public class PmsSkuStockExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -797,7 +797,6 @@ public class PmsSkuStockExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java

@@ -8,7 +8,7 @@ import java.util.Date;
 public class SmsCoupon implements Serializable {
     private Long id;
 
-    @ApiModelProperty(value = "优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券")
+    @ApiModelProperty(value = "优惠券类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券")
     private Integer type;
 
     private String name;