diff --git a/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java b/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java index 53bfd2b..dd93ff8 100644 --- a/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java +++ b/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)); } } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java index 5d1c852..0f97d9d 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategoryExample.java @@ -11,7 +11,7 @@ public class CmsHelpCategoryExample { protected List oredCriteria; public CmsHelpCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsHelpCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public class CmsHelpCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpExample.java index d70fe53..d60579b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpExample.java @@ -12,7 +12,7 @@ public class CmsHelpExample { protected List oredCriteria; public CmsHelpExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsHelpExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public class CmsHelpExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReportExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReportExample.java index ba6f389..f218943 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReportExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReportExample.java @@ -12,7 +12,7 @@ public class CmsMemberReportExample { protected List oredCriteria; public CmsMemberReportExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsMemberReportExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -617,7 +617,6 @@ public class CmsMemberReportExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaExample.java index 05859c9..92b11ea 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaExample.java @@ -11,7 +11,7 @@ public class CmsPrefrenceAreaExample { protected List oredCriteria; public CmsPrefrenceAreaExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsPrefrenceAreaExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public class CmsPrefrenceAreaExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelationExample.java index b6c4dc5..a3ad81c 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelationExample.java @@ -11,7 +11,7 @@ public class CmsPrefrenceAreaProductRelationExample { protected List oredCriteria; public CmsPrefrenceAreaProductRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsPrefrenceAreaProductRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class CmsPrefrenceAreaProductRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategoryExample.java index 568e0e3..697fec0 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategoryExample.java @@ -11,7 +11,7 @@ public class CmsSubjectCategoryExample { protected List oredCriteria; public CmsSubjectCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsSubjectCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public class CmsSubjectCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCommentExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCommentExample.java index 4448f42..bee2327 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCommentExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCommentExample.java @@ -12,7 +12,7 @@ public class CmsSubjectCommentExample { protected List oredCriteria; public CmsSubjectCommentExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsSubjectCommentExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public class CmsSubjectCommentExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectExample.java index 7526948..62e2333 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectExample.java @@ -12,7 +12,7 @@ public class CmsSubjectExample { protected List oredCriteria; public CmsSubjectExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsSubjectExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1057,7 +1057,6 @@ public class CmsSubjectExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelationExample.java index 34312e0..d574125 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelationExample.java @@ -11,7 +11,7 @@ public class CmsSubjectProductRelationExample { protected List oredCriteria; public CmsSubjectProductRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsSubjectProductRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class CmsSubjectProductRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategoryExample.java index 922a10d..59ac1f2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategoryExample.java @@ -11,7 +11,7 @@ public class CmsTopicCategoryExample { protected List oredCriteria; public CmsTopicCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class CmsTopicCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public class CmsTopicCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCommentExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCommentExample.java index 8837c9b..a10fb55 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCommentExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCommentExample.java @@ -12,7 +12,7 @@ public class CmsTopicCommentExample { protected List oredCriteria; public CmsTopicCommentExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsTopicCommentExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public class CmsTopicCommentExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicExample.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicExample.java index de1c610..6cc6c32 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicExample.java @@ -12,7 +12,7 @@ public class CmsTopicExample { protected List oredCriteria; public CmsTopicExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class CmsTopicExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public class CmsTopicExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java index c13cbd3..ce3a1d5 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java @@ -13,7 +13,7 @@ public class OmsCartItemExample { protected List oredCriteria; public OmsCartItemExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class OmsCartItemExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1268,7 +1268,6 @@ public class OmsCartItemExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java index 1773b1f..29dc3a7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddressExample.java @@ -11,7 +11,7 @@ public class OmsCompanyAddressExample { protected List oredCriteria; public OmsCompanyAddressExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class OmsCompanyAddressExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -776,7 +776,6 @@ public class OmsCompanyAddressExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java index e06d11f..abf494a 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java @@ -13,7 +13,7 @@ public class OmsOrderExample { protected List oredCriteria; public OmsOrderExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class OmsOrderExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -2918,7 +2918,6 @@ public class OmsOrderExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java index 708ad6b..e3b06a5 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java @@ -12,7 +12,7 @@ public class OmsOrderItemExample { protected List oredCriteria; public OmsOrderItemExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class OmsOrderItemExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1447,7 +1447,6 @@ public class OmsOrderItemExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistoryExample.java index 5fd135f..bc74b22 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistoryExample.java @@ -12,7 +12,7 @@ public class OmsOrderOperateHistoryExample { protected List oredCriteria; public OmsOrderOperateHistoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class OmsOrderOperateHistoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -487,7 +487,6 @@ public class OmsOrderOperateHistoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java index 873e07e..503b42a 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApplyExample.java @@ -13,7 +13,7 @@ public class OmsOrderReturnApplyExample { protected List oredCriteria; public OmsOrderReturnApplyExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class OmsOrderReturnApplyExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1878,7 +1878,6 @@ public class OmsOrderReturnApplyExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReasonExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReasonExample.java index 0b83a8d..aeeb85d 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReasonExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReasonExample.java @@ -12,7 +12,7 @@ public class OmsOrderReturnReasonExample { protected List oredCriteria; public OmsOrderReturnReasonExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class OmsOrderReturnReasonExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -417,7 +417,6 @@ public class OmsOrderReturnReasonExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSettingExample.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSettingExample.java index 6761c0f..e4055e7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSettingExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSettingExample.java @@ -11,7 +11,7 @@ public class OmsOrderSettingExample { protected List oredCriteria; public OmsOrderSettingExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class OmsOrderSettingExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -466,7 +466,6 @@ public class OmsOrderSettingExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumExample.java index d08a83f..bc406c2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumExample.java @@ -11,7 +11,7 @@ public class PmsAlbumExample { protected List oredCriteria; public PmsAlbumExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsAlbumExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -496,7 +496,6 @@ public class PmsAlbumExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPicExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPicExample.java index 27a46ee..4ee4192 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPicExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPicExample.java @@ -11,7 +11,7 @@ public class PmsAlbumPicExample { protected List oredCriteria; public PmsAlbumPicExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsAlbumPicExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -296,7 +296,6 @@ public class PmsAlbumPicExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsBrandExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsBrandExample.java index 00c0191..611e5c9 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsBrandExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsBrandExample.java @@ -11,7 +11,7 @@ public class PmsBrandExample { protected List oredCriteria; public PmsBrandExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsBrandExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -746,7 +746,6 @@ public class PmsBrandExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentExample.java index dd91ebf..0823077 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentExample.java @@ -12,7 +12,7 @@ public class PmsCommentExample { protected List oredCriteria; public PmsCommentExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsCommentExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1007,7 +1007,6 @@ public class PmsCommentExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplayExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplayExample.java index e4ce5dd..88eaf06 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplayExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplayExample.java @@ -12,7 +12,7 @@ public class PmsCommentReplayExample { protected List oredCriteria; public PmsCommentReplayExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsCommentReplayExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public class PmsCommentReplayExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplateExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplateExample.java index 5fc6cd1..900dbaa 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplateExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplateExample.java @@ -12,7 +12,7 @@ public class PmsFeightTemplateExample { protected List oredCriteria; public PmsFeightTemplateExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsFeightTemplateExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public class PmsFeightTemplateExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPriceExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPriceExample.java index acf6b71..6098bdb 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPriceExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPriceExample.java @@ -12,7 +12,7 @@ public class PmsMemberPriceExample { protected List oredCriteria; public PmsMemberPriceExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsMemberPriceExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -417,7 +417,6 @@ public class PmsMemberPriceExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategoryExample.java index 89e45f4..b6ca15f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategoryExample.java @@ -11,7 +11,7 @@ public class PmsProductAttributeCategoryExample { protected List oredCriteria; public PmsProductAttributeCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsProductAttributeCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -356,7 +356,6 @@ public class PmsProductAttributeCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeExample.java index caa0cfd..0ab45c3 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeExample.java @@ -11,7 +11,7 @@ public class PmsProductAttributeExample { protected List oredCriteria; public PmsProductAttributeExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsProductAttributeExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -846,7 +846,6 @@ public class PmsProductAttributeExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValueExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValueExample.java index 298d942..3cc7711 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValueExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValueExample.java @@ -11,7 +11,7 @@ public class PmsProductAttributeValueExample { protected List oredCriteria; public PmsProductAttributeValueExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsProductAttributeValueExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -356,7 +356,6 @@ public class PmsProductAttributeValueExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelationExample.java index 89549a7..bbd1d80 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelationExample.java @@ -11,7 +11,7 @@ public class PmsProductCategoryAttributeRelationExample { protected List oredCriteria; public PmsProductCategoryAttributeRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsProductCategoryAttributeRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class PmsProductCategoryAttributeRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryExample.java index c3ab334..75f0a48 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryExample.java @@ -11,7 +11,7 @@ public class PmsProductCategoryExample { protected List oredCriteria; public PmsProductCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class PmsProductCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -806,7 +806,6 @@ public class PmsProductCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java index 3ad480e..71561c0 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java @@ -13,7 +13,7 @@ public class PmsProductExample { protected List oredCriteria; public PmsProductExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class PmsProductExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -2508,7 +2508,6 @@ public class PmsProductExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReductionExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReductionExample.java index 658bfc9..f1a9d70 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReductionExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReductionExample.java @@ -12,7 +12,7 @@ public class PmsProductFullReductionExample { protected List oredCriteria; public PmsProductFullReductionExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsProductFullReductionExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -347,7 +347,6 @@ public class PmsProductFullReductionExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadderExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadderExample.java index c2fc31e..c27e415 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadderExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadderExample.java @@ -12,7 +12,7 @@ public class PmsProductLadderExample { protected List oredCriteria; public PmsProductLadderExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsProductLadderExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -407,7 +407,6 @@ public class PmsProductLadderExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLogExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLogExample.java index df4042b..3a66910 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLogExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLogExample.java @@ -13,7 +13,7 @@ public class PmsProductOperateLogExample { protected List oredCriteria; public PmsProductOperateLogExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class PmsProductOperateLogExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -838,7 +838,6 @@ public class PmsProductOperateLogExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecordExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecordExample.java index 175def4..c9fb11f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecordExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecordExample.java @@ -12,7 +12,7 @@ public class PmsProductVertifyRecordExample { protected List oredCriteria; public PmsProductVertifyRecordExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsProductVertifyRecordExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -487,7 +487,6 @@ public class PmsProductVertifyRecordExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java index db8a124..8b6cc77 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java @@ -12,7 +12,7 @@ public class PmsSkuStockExample { protected List oredCriteria; public PmsSkuStockExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class PmsSkuStockExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public class PmsSkuStockExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java index e4e6e06..6da1b70 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java +++ b/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; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponExample.java index 0b778b8..9d38669 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponExample.java @@ -13,7 +13,7 @@ public class SmsCouponExample { protected List oredCriteria; public SmsCouponExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class SmsCouponExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1218,7 +1218,6 @@ public class SmsCouponExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistoryExample.java index 414a2c2..27bd2ff 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistoryExample.java @@ -12,7 +12,7 @@ public class SmsCouponHistoryExample { protected List oredCriteria; public SmsCouponHistoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class SmsCouponHistoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public class SmsCouponHistoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java index 7d259ec..76fe8df 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelationExample.java @@ -11,7 +11,7 @@ public class SmsCouponProductCategoryRelationExample { protected List oredCriteria; public SmsCouponProductCategoryRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsCouponProductCategoryRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public class SmsCouponProductCategoryRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java index 93ccccd..ea39d00 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelationExample.java @@ -11,7 +11,7 @@ public class SmsCouponProductRelationExample { protected List oredCriteria; public SmsCouponProductRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsCouponProductRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public class SmsCouponProductRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionExample.java index 1942257..d377d4e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionExample.java @@ -13,7 +13,7 @@ public class SmsFlashPromotionExample { protected List oredCriteria; public SmsFlashPromotionExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class SmsFlashPromotionExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + 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 dateList = new ArrayList(); + List dateList = new ArrayList<>(); Iterator 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(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLogExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLogExample.java index b841274..55058d3 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLogExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLogExample.java @@ -12,7 +12,7 @@ public class SmsFlashPromotionLogExample { protected List oredCriteria; public SmsFlashPromotionLogExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class SmsFlashPromotionLogExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public class SmsFlashPromotionLogExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelationExample.java index 277a6e3..41c6f49 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelationExample.java @@ -12,7 +12,7 @@ public class SmsFlashPromotionProductRelationExample { protected List oredCriteria; public SmsFlashPromotionProductRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class SmsFlashPromotionProductRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -587,7 +587,6 @@ public class SmsFlashPromotionProductRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSessionExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSessionExample.java index dca6281..f3e4aa6 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSessionExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSessionExample.java @@ -13,7 +13,7 @@ public class SmsFlashPromotionSessionExample { protected List oredCriteria; public SmsFlashPromotionSessionExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class SmsFlashPromotionSessionExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + 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 timeList = new ArrayList(); + List timeList = new ArrayList<>(); Iterator 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(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertiseExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertiseExample.java index 2e38d23..cc23745 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertiseExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertiseExample.java @@ -12,7 +12,7 @@ public class SmsHomeAdvertiseExample { protected List oredCriteria; public SmsHomeAdvertiseExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class SmsHomeAdvertiseExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -867,7 +867,6 @@ public class SmsHomeAdvertiseExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrandExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrandExample.java index 020d0e1..ce08d4f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrandExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrandExample.java @@ -11,7 +11,7 @@ public class SmsHomeBrandExample { protected List oredCriteria; public SmsHomeBrandExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsHomeBrandExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public class SmsHomeBrandExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProductExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProductExample.java index 01d40f5..908652c 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProductExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProductExample.java @@ -11,7 +11,7 @@ public class SmsHomeNewProductExample { protected List oredCriteria; public SmsHomeNewProductExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsHomeNewProductExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public class SmsHomeNewProductExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProductExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProductExample.java index 13a1259..73a8c72 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProductExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProductExample.java @@ -11,7 +11,7 @@ public class SmsHomeRecommendProductExample { protected List oredCriteria; public SmsHomeRecommendProductExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsHomeRecommendProductExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public class SmsHomeRecommendProductExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubjectExample.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubjectExample.java index 625a56a..bccd3d8 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubjectExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubjectExample.java @@ -11,7 +11,7 @@ public class SmsHomeRecommendSubjectExample { protected List oredCriteria; public SmsHomeRecommendSubjectExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class SmsHomeRecommendSubjectExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public class SmsHomeRecommendSubjectExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminExample.java index 7eb95f7..4ec3239 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminExample.java @@ -12,7 +12,7 @@ public class UmsAdminExample { protected List oredCriteria; public UmsAdminExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsAdminExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -767,7 +767,6 @@ public class UmsAdminExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLogExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLogExample.java index 64f3924..1ff86de 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLogExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLogExample.java @@ -12,7 +12,7 @@ public class UmsAdminLoginLogExample { protected List oredCriteria; public UmsAdminLoginLogExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsAdminLoginLogExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -497,7 +497,6 @@ public class UmsAdminLoginLogExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelationExample.java index 920c002..f3e7e42 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelationExample.java @@ -11,7 +11,7 @@ public class UmsAdminPermissionRelationExample { protected List oredCriteria; public UmsAdminPermissionRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsAdminPermissionRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -346,7 +346,6 @@ public class UmsAdminPermissionRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelationExample.java index 40a9628..d8d1df2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelationExample.java @@ -11,7 +11,7 @@ public class UmsAdminRoleRelationExample { protected List oredCriteria; public UmsAdminRoleRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsAdminRoleRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsAdminRoleRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistoryExample.java index cb3985c..5d97472 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistoryExample.java @@ -12,7 +12,7 @@ public class UmsGrowthChangeHistoryExample { protected List oredCriteria; public UmsGrowthChangeHistoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsGrowthChangeHistoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public class UmsGrowthChangeHistoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistoryExample.java index 4c52884..a38b5da 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistoryExample.java @@ -12,7 +12,7 @@ public class UmsIntegrationChangeHistoryExample { protected List oredCriteria; public UmsIntegrationChangeHistoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsIntegrationChangeHistoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public class UmsIntegrationChangeHistoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java index 7908264..ff0f373 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSettingExample.java @@ -11,7 +11,7 @@ public class UmsIntegrationConsumeSettingExample { protected List oredCriteria; public UmsIntegrationConsumeSettingExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsIntegrationConsumeSettingExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -406,7 +406,6 @@ public class UmsIntegrationConsumeSettingExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java index 363ae06..76731ca 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java @@ -13,7 +13,7 @@ public class UmsMemberExample { protected List oredCriteria; public UmsMemberExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class UmsMemberExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + 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 dateList = new ArrayList(); + List dateList = new ArrayList<>(); Iterator 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(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevelExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevelExample.java index 1358b3b..e387cf2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevelExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevelExample.java @@ -12,7 +12,7 @@ public class UmsMemberLevelExample { protected List oredCriteria; public UmsMemberLevelExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsMemberLevelExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -907,7 +907,6 @@ public class UmsMemberLevelExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLogExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLogExample.java index 261b4bf..bda629d 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLogExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLogExample.java @@ -12,7 +12,7 @@ public class UmsMemberLoginLogExample { protected List oredCriteria; public UmsMemberLoginLogExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsMemberLoginLogExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public class UmsMemberLoginLogExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelationExample.java index 60a7c67..eeda427 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelationExample.java @@ -11,7 +11,7 @@ public class UmsMemberMemberTagRelationExample { protected List oredCriteria; public UmsMemberMemberTagRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsMemberMemberTagRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsMemberMemberTagRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelationExample.java index 46e5390..5634f1c 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelationExample.java @@ -11,7 +11,7 @@ public class UmsMemberProductCategoryRelationExample { protected List oredCriteria; public UmsMemberProductCategoryRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsMemberProductCategoryRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsMemberProductCategoryRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java index f0ea3e7..de400d1 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddressExample.java @@ -11,7 +11,7 @@ public class UmsMemberReceiveAddressExample { protected List oredCriteria; public UmsMemberReceiveAddressExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsMemberReceiveAddressExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -776,7 +776,6 @@ public class UmsMemberReceiveAddressExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSettingExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSettingExample.java index 5c531a7..c445fb6 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSettingExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSettingExample.java @@ -12,7 +12,7 @@ public class UmsMemberRuleSettingExample { protected List oredCriteria; public UmsMemberRuleSettingExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsMemberRuleSettingExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -527,7 +527,6 @@ public class UmsMemberRuleSettingExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfoExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfoExample.java index d1ab932..c615b9b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfoExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfoExample.java @@ -13,7 +13,7 @@ public class UmsMemberStatisticsInfoExample { protected List oredCriteria; public UmsMemberStatisticsInfoExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -70,7 +70,7 @@ public class UmsMemberStatisticsInfoExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1068,7 +1068,6 @@ public class UmsMemberStatisticsInfoExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTagExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTagExample.java index de717cd..c45777f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTagExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTagExample.java @@ -12,7 +12,7 @@ public class UmsMemberTagExample { protected List oredCriteria; public UmsMemberTagExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsMemberTagExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -357,7 +357,6 @@ public class UmsMemberTagExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTaskExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTaskExample.java index 581d2ad..f57ad1e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTaskExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTaskExample.java @@ -11,7 +11,7 @@ public class UmsMemberTaskExample { protected List oredCriteria; public UmsMemberTaskExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsMemberTaskExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public class UmsMemberTaskExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMenuExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMenuExample.java index 40dd7b8..2245e6a 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMenuExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMenuExample.java @@ -12,7 +12,7 @@ public class UmsMenuExample { protected List oredCriteria; public UmsMenuExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsMenuExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -677,7 +677,6 @@ public class UmsMenuExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsPermissionExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsPermissionExample.java index 1aabf1c..ad28b6e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsPermissionExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsPermissionExample.java @@ -12,7 +12,7 @@ public class UmsPermissionExample { protected List oredCriteria; public UmsPermissionExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsPermissionExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -747,7 +747,6 @@ public class UmsPermissionExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceCategoryExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceCategoryExample.java index 12a6678..4c1651e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceCategoryExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceCategoryExample.java @@ -12,7 +12,7 @@ public class UmsResourceCategoryExample { protected List oredCriteria; public UmsResourceCategoryExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsResourceCategoryExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -357,7 +357,6 @@ public class UmsResourceCategoryExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceExample.java index 90ecd70..9993cfe 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsResourceExample.java @@ -12,7 +12,7 @@ public class UmsResourceExample { protected List oredCriteria; public UmsResourceExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsResourceExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -497,7 +497,6 @@ public class UmsResourceExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleExample.java index 0ab6a71..621ff44 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleExample.java @@ -12,7 +12,7 @@ public class UmsRoleExample { protected List oredCriteria; public UmsRoleExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -69,7 +69,7 @@ public class UmsRoleExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public class UmsRoleExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleMenuRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleMenuRelationExample.java index ac8008a..5da206d 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleMenuRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleMenuRelationExample.java @@ -11,7 +11,7 @@ public class UmsRoleMenuRelationExample { protected List oredCriteria; public UmsRoleMenuRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsRoleMenuRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsRoleMenuRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelationExample.java index 73bb5a9..45250af 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelationExample.java @@ -11,7 +11,7 @@ public class UmsRolePermissionRelationExample { protected List oredCriteria; public UmsRolePermissionRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsRolePermissionRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsRolePermissionRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleResourceRelationExample.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleResourceRelationExample.java index cf61066..da9b7af 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleResourceRelationExample.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsRoleResourceRelationExample.java @@ -11,7 +11,7 @@ public class UmsRoleResourceRelationExample { protected List oredCriteria; public UmsRoleResourceRelationExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } public void setOrderByClause(String orderByClause) { @@ -68,7 +68,7 @@ public class UmsRoleResourceRelationExample { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public class UmsRoleResourceRelationExample { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/pom.xml b/pom.xml index b64dd6b..2321483 100644 --- a/pom.xml +++ b/pom.xml @@ -33,16 +33,16 @@ true http://192.168.3.101:2375 1.2.2 - 1.2.10 - 5.1.8 - 1.1.10 - 4.5.7 + 1.3.0 + 5.2.0 + 1.1.23 + 5.4.0 2.9.2 1.6.0 1.6.0 - 1.3.7 - 3.4.6 - 8.0.16 + 1.4.0 + 3.5.5 + 8.0.20 2.3.0.RELEASE 0.9.0 2.5.0