Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java

@@ -14,6 +14,7 @@ public class UserCouponVo {
      * 卷描述
      */
     private String detail;
+    private String shopId;
     private String shopName;
     /**
      * 优惠金额

src/main/resources/mapper/TbActivateInRecordMapper.xml

@@ -52,6 +52,7 @@
         SELECT tb_product.name as detail,
         0 as status,
         sum(tb_activate_in_record.over_num) as num,
+        tb_activate_in_record.shop_id as shopId,
         <choose>
             <when test="shopName != null and shopName != ''">#{shopName}</when>
             <otherwise>''</otherwise>