diff --git a/yshop-admin/src/main/resources/config/application-dev.yml b/yshop-admin/src/main/resources/config/application-dev.yml index 94eb41d4..af6aba5e 100644 --- a/yshop-admin/src/main/resources/config/application-dev.yml +++ b/yshop-admin/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root - password: root + password: 123456 # 初始化配置 initial-size: 3 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/YxUserBillQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/YxUserBillQueryCriteria.java index 84ba1ace..6155d9b0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/YxUserBillQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/YxUserBillQueryCriteria.java @@ -14,13 +14,16 @@ import lombok.Data; */ @Data public class YxUserBillQueryCriteria{ - private String nickname; - private String category; - private String type; + @Query(type = Query.Type.EQUAL) + private String nickname = ""; + @Query(type = Query.Type.EQUAL) + private String category = ""; + @Query(type = Query.Type.EQUAL) + private String type = ""; @Query(type = Query.Type.EQUAL) private Integer pm; @Query(type = Query.Type.EQUAL) - private String title; + private String title = ""; private String startTime; private String endTime;