Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

buyer-api/src/main/resources/application.yml

@@ -137,6 +137,7 @@ ignored:
     - /buyer/passport/connect/**
     - /buyer/members/**
     - /buyer/passport/member/**
+    - /buyer/passport/member/refresh/**
     - /buyer/promotion/pintuan/**
     - /buyer/promotion/seckill/**
     - /buyer/promotion/pointsGoods/**

config/application.yml

@@ -125,6 +125,7 @@ ignored:
     - /weixin/**
     - /source/**
     - /store/passport/login/**
+    - /store/passport/login/refresh/**
     - /common/common/slider/**
     - /common/common/sms/**
     - /buyer/payment/cashier/**
@@ -135,6 +136,7 @@ ignored:
     - /buyer/passport/connect/**
     - /buyer/members/**
     - /buyer/passport/member/**
+    - /buyer/passport/member/refresh/**
     - /buyer/promotion/pintuan/**
     - /buyer/promotion/seckill/**
     - /buyer/promotion/pointsGoods/**

framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/FullDiscountSearchParams.java

@@ -34,7 +34,7 @@ public class FullDiscountSearchParams extends BasePromotionsSearchParams impleme
     public <T> QueryWrapper<T> queryWrapper() {
         QueryWrapper<T> queryWrapper = super.queryWrapper();
         if (CharSequenceUtil.isNotEmpty(promotionName)) {
-            queryWrapper.like("title", promotionName);
+            queryWrapper.like("promotion_name", promotionName);
         }
         if (couponFlag != null) {
             queryWrapper.eq("coupon_flag", couponFlag);

seller-api/src/main/resources/application.yml

@@ -120,6 +120,7 @@ ignored:
     - /weixin/**
     - /source/**
     - /store/passport/login/**
+    - /store/passport/login/refresh/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html