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();
         }