sms配置文件

cash-api/order-server/src/main/resources/application.yml

@@ -6,6 +6,7 @@ spring:
     name: order-server
   profiles:
     active: dev
+    include: tools
 
 logging:
   config: classpath:logback.xml

cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java

@@ -3,6 +3,7 @@ package com.czg.order.vo;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,7 @@ import java.util.Map;
  * @author ww
  * @description
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class HistoryOrderVo extends OrderInfo {
 //    private OrderInfo info;

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java

@@ -90,7 +90,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
         if (CollectionUtil.isNotEmpty(shopUserIds)) {
             return couponRecordService.findByUser(PageUtil.buildPage(), shopUserIds, status);
         }
-        return null;
+        return new Page<>();
     }
 
     @Override