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 53bfd2bd97..dd93ff84bb 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 @@ 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 @@ private void addFieldJavaDoc(Field field, String remarks) { 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 5d1c852cc7..0f97d9d1a2 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 d70fe53e38..d60579b4a6 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public Criteria andReadCountNotBetween(Integer value1, Integer value2) { } 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 ba6f3893ee..f2189436f0 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -617,7 +617,6 @@ public Criteria andNoteNotBetween(String value1, String value2) { } 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 05859c90a8..92b11eaa2b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public Criteria andShowStatusNotBetween(Integer value1, Integer value2) { } 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 b6c4dc58ea..a3ad81c2c4 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andProductIdNotBetween(Long value1, Long value2) { } 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 568e0e3a65..697fec0755 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 4448f42db7..bee2327e57 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public Criteria andShowStatusNotBetween(Integer value1, Integer value2) { } 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 75269486d6..62e2333dfa 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1057,7 +1057,6 @@ public Criteria andCategoryNameNotBetween(String value1, String value2) { } 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 34312e0645..d574125291 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andProductIdNotBetween(Long value1, Long value2) { } 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 922a10d67c..59ac1f2d58 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -486,7 +486,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 8837c9b54d..a10fb551b5 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public Criteria andShowStatusNotBetween(Integer value1, Integer value2) { } 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 de1c610b6c..6cc6c321b8 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public Criteria andAttendTypeNotBetween(String value1, String value2) { } 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 c13cbd32a3..ce3a1d5001 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1268,7 +1268,6 @@ public Criteria andProductAttrNotBetween(String value1, String value2) { } 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 1773b1f2dc..29dc3a7c76 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -776,7 +776,6 @@ public Criteria andDetailAddressNotBetween(String value1, String value2) { } 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 e06d11fca9..abf494a27b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -2918,7 +2918,6 @@ public Criteria andModifyTimeNotBetween(Date value1, Date value2) { } 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 708ad6bc63..e3b06a5c0f 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1447,7 +1447,6 @@ public Criteria andProductAttrNotBetween(String value1, String value2) { } 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 5fd135ffd4..bc74b22704 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -487,7 +487,6 @@ public Criteria andNoteNotBetween(String value1, String value2) { } 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 873e07e861..503b42a642 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1878,7 +1878,6 @@ public Criteria andReceiveNoteNotBetween(String value1, String value2) { } 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 0b83a8da13..aeeb85dcf8 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -417,7 +417,6 @@ public Criteria andCreateTimeNotBetween(Date value1, Date value2) { } 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 6761c0f145..e4055e7ca3 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -466,7 +466,6 @@ public Criteria andCommentOvertimeNotBetween(Integer value1, Integer value2) { } 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 d08a83fafc..bc406c2ea3 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -496,7 +496,6 @@ public Criteria andDescriptionNotBetween(String value1, String value2) { } 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 27a46ee011..4ee4192dfc 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -296,7 +296,6 @@ public Criteria andPicNotBetween(String value1, String value2) { } 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 00c019134a..611e5c9ac0 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -746,7 +746,6 @@ public Criteria andBigPicNotBetween(String value1, String value2) { } 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 dd91ebf596..08230770ee 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1007,7 +1007,6 @@ public Criteria andReplayCountNotBetween(Integer value1, Integer value2) { } 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 e4ce5ddaf0..88eaf06b40 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public Criteria andTypeNotBetween(Integer value1, Integer value2) { } 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 5fc6cd1d0f..900dbaaeae 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public Criteria andDestNotBetween(String value1, String value2) { } 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 acf6b71220..6098bdbdca 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -417,7 +417,6 @@ public Criteria andMemberLevelNameNotBetween(String value1, String value2) { } 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 89e45f49fc..b6ca15fa71 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -356,7 +356,6 @@ public Criteria andParamCountNotBetween(Integer value1, Integer value2) { } 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 caa0cfde2d..0ab45c39c6 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -846,7 +846,6 @@ public Criteria andTypeNotBetween(Integer value1, Integer value2) { } 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 298d942098..3cc7711dd4 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -356,7 +356,6 @@ public Criteria andValueNotBetween(String value1, String value2) { } 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 89549a78bd..bbd1d80e5b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andProductAttributeIdNotBetween(Long value1, Long value2) { } 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 c3ab334ed3..75f0a48c58 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -806,7 +806,6 @@ public Criteria andKeywordsNotBetween(String value1, String value2) { } 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 3ad480e475..71561c05bc 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -2508,7 +2508,6 @@ public Criteria andProductCategoryNameNotBetween(String value1, String value2) { } 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 658bfc9836..f1a9d704df 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -347,7 +347,6 @@ public Criteria andReducePriceNotBetween(BigDecimal value1, BigDecimal value2) { } 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 c2fc31e470..c27e4158ee 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -407,7 +407,6 @@ public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { } 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 df4042be0c..3a66910968 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -838,7 +838,6 @@ public Criteria andCreateTimeNotBetween(Date value1, Date value2) { } 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 175def4795..c9fb11f01b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -487,7 +487,6 @@ public Criteria andDetailNotBetween(String value1, String value2) { } 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 db8a1248e1..8b6cc773e6 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public Criteria andSpDataNotBetween(String value1, String value2) { } 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 e4e6e06d53..6da1b700ab 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 @@ 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 0b778b850a..9d3866954b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1218,7 +1218,6 @@ public Criteria andMemberLevelNotBetween(Integer value1, Integer value2) { } 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 414a2c29e7..27bd2ffff1 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -797,7 +797,6 @@ public Criteria andOrderSnNotBetween(String value1, String value2) { } 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 7d259eccd3..76fe8dfd6f 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public Criteria andParentCategoryNameNotBetween(String value1, String value2) { } 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 93ccccd82a..ea39d00a98 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -426,7 +426,6 @@ public Criteria andProductSnNotBetween(String value1, String value2) { } 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 1942257cef..d377d4e583 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -117,7 +117,7 @@ protected void addCriterionForJDBCDate(String condition, List values, Stri 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 Criteria andCreateTimeNotBetween(Date value1, Date value2) { } 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 b841274876..55058d32b9 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public Criteria andSendTimeNotBetween(Date value1, Date value2) { } 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 277a6e3e11..41c6f49c8b 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -587,7 +587,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 dca6281a68..f3e4aa6e83 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -117,7 +117,7 @@ protected void addCriterionForJDBCTime(String condition, List values, Stri 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 Criteria andCreateTimeNotBetween(Date value1, Date value2) { } 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 2e38d23a80..cc237453ee 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -867,7 +867,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 020d0e129b..ce08d4f0f7 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 01d40f58dd..908652cec0 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 13a1259f95..73a8c72bb3 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 625a56a2da..bccd3d8502 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 7eb95f7d91..4ec3239e2f 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -767,7 +767,6 @@ public Criteria andStatusNotBetween(Integer value1, Integer value2) { } 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 64f3924b0d..1ff86de974 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -497,7 +497,6 @@ public Criteria andUserAgentNotBetween(String value1, String value2) { } 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 920c002372..f3e7e4295a 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -346,7 +346,6 @@ public Criteria andTypeNotBetween(Integer value1, Integer value2) { } 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 40a9628743..d8d1df2187 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andRoleIdNotBetween(Long value1, Long value2) { } 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 cb3985c37c..5d97472f28 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public Criteria andSourceTypeNotBetween(Integer value1, Integer value2) { } 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 4c528840c3..a38b5da3e7 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -607,7 +607,6 @@ public Criteria andSourceTypeNotBetween(Integer value1, Integer value2) { } 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 79082643ab..ff0f37357d 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -406,7 +406,6 @@ public Criteria andCouponStatusNotBetween(Integer value1, Integer value2) { } 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 363ae063ed..76731ca380 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -117,7 +117,7 @@ protected void addCriterionForJDBCDate(String condition, List values, Stri 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 Criteria andHistoryIntegrationNotBetween(Integer value1, Integer value2) } 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 1358b3b387..e387cf25e3 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -907,7 +907,6 @@ public Criteria andNoteNotBetween(String value1, String value2) { } 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 261b4bf086..bda629dcab 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -557,7 +557,6 @@ public Criteria andProvinceNotBetween(String value1, String value2) { } 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 60a7c6720e..eeda427ab7 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andTagIdNotBetween(Long value1, Long value2) { } 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 46e539096e..5634f1cc20 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andProductCategoryIdNotBetween(Long value1, Long value2) { } 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 f0ea3e7bfa..de400d1084 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -776,7 +776,6 @@ public Criteria andDetailAddressNotBetween(String value1, String value2) { } 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 5c531a7251..c445fb67a1 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -527,7 +527,6 @@ public Criteria andTypeNotBetween(Integer value1, Integer value2) { } 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 d1ab932b2c..c615b9b091 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1068,7 +1068,6 @@ public Criteria andRecentOrderTimeNotBetween(Date value1, Date value2) { } 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 de717cd321..c45777f2bf 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -357,7 +357,6 @@ public Criteria andFinishOrderAmountNotBetween(BigDecimal value1, BigDecimal val } 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 581d2add6a..f57ad1e6d7 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -416,7 +416,6 @@ public Criteria andTypeNotBetween(Integer value1, Integer value2) { } 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 40dd7b8fc0..2245e6a3ee 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -677,7 +677,6 @@ public Criteria andHiddenNotBetween(Integer value1, Integer value2) { } 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 1aabf1c334..ad28b6e920 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -747,7 +747,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 12a6678fa2..4c1651eca2 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -357,7 +357,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 90ecd707e3..9993cfe0a0 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -497,7 +497,6 @@ public Criteria andCategoryIdNotBetween(Long value1, Long value2) { } 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 0ab6a715c4..621ff444e2 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -547,7 +547,6 @@ public Criteria andSortNotBetween(Integer value1, Integer value2) { } 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 ac8008a71a..5da206d9e4 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andMenuIdNotBetween(Long value1, Long value2) { } 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 73bb5a9863..45250afc60 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andPermissionIdNotBetween(Long value1, Long value2) { } 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 cf61066270..da9b7af5da 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 @@ protected abstract static class GeneratedCriteria { protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -286,7 +286,6 @@ public Criteria andResourceIdNotBetween(Long value1, Long value2) { } public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } diff --git a/pom.xml b/pom.xml index b64dd6ba2e..2321483773 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