Maven依赖版本升级

mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java

@@ -17,6 +17,7 @@ import java.util.Properties;
 public class CommentGenerator extends DefaultCommentGenerator {
     private boolean addRemarkComments = false;
     private static final String EXAMPLE_SUFFIX="Example";
+    private static final String MAPPER_SUFFIX="Mapper";
     private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
 
     /**
@@ -66,7 +67,7 @@ public class CommentGenerator extends DefaultCommentGenerator {
     public void addJavaFileComment(CompilationUnit compilationUnit) {
         super.addJavaFileComment(compilationUnit);
         //只在model中添加swagger注解类的导入
-        if(!compilationUnit.isJavaInterface()&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
+        if(!compilationUnit.getType().getFullyQualifiedName().contains(MAPPER_SUFFIX)&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
             compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
         }
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@ public class SmsFlashPromotionExample {
     protected List<Criteria> oredCriteria;
 
     public SmsFlashPromotionExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class SmsFlashPromotionExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -117,7 +117,7 @@ public class SmsFlashPromotionExample {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            List<java.sql.Date> dateList = new ArrayList<>();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 dateList.add(new java.sql.Date(iter.next().getTime()));
@@ -504,7 +504,6 @@ public class SmsFlashPromotionExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

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

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

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

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

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

@@ -13,7 +13,7 @@ public class SmsFlashPromotionSessionExample {
     protected List<Criteria> oredCriteria;
 
     public SmsFlashPromotionSessionExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class SmsFlashPromotionSessionExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -117,7 +117,7 @@ public class SmsFlashPromotionSessionExample {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Time> timeList = new ArrayList<java.sql.Time>();
+            List<java.sql.Time> timeList = new ArrayList<>();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 timeList.add(new java.sql.Time(iter.next().getTime()));
@@ -504,7 +504,6 @@ public class SmsFlashPromotionSessionExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@ public class UmsMemberExample {
     protected List<Criteria> oredCriteria;
 
     public UmsMemberExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class UmsMemberExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -117,7 +117,7 @@ public class UmsMemberExample {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            List<java.sql.Date> dateList = new ArrayList<>();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 dateList.add(new java.sql.Date(iter.next().getTime()));
@@ -1354,7 +1354,6 @@ public class UmsMemberExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

pom.xml

@@ -33,16 +33,16 @@
         <skipTests>true</skipTests>
         <docker.host>http://192.168.3.101:2375</docker.host>
         <docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
-        <pagehelper-starter.version>1.2.10</pagehelper-starter.version>
+        <pagehelper-starter.version>1.3.0</pagehelper-starter.version>
-        <pagehelper.version>5.1.8</pagehelper.version>
+        <pagehelper.version>5.2.0</pagehelper.version>
-        <druid.version>1.1.10</druid.version>
+        <druid.version>1.1.23</druid.version>
-        <hutool.version>4.5.7</hutool.version>
+        <hutool.version>5.4.0</hutool.version>
         <swagger2.version>2.9.2</swagger2.version>
         <swagger-models.version>1.6.0</swagger-models.version>
         <swagger-annotations.version>1.6.0</swagger-annotations.version>
-        <mybatis-generator.version>1.3.7</mybatis-generator.version>
+        <mybatis-generator.version>1.4.0</mybatis-generator.version>
-        <mybatis.version>3.4.6</mybatis.version>
+        <mybatis.version>3.5.5</mybatis.version>
-        <mysql-connector.version>8.0.16</mysql-connector.version>
+        <mysql-connector.version>8.0.20</mysql-connector.version>
         <spring-data-commons.version>2.3.0.RELEASE</spring-data-commons.version>
         <jjwt.version>0.9.0</jjwt.version>
         <aliyun-oss.version>2.5.0</aliyun-oss.version>