Merge remote-tracking branch 'origin/master'

cash-common/cash-common-redis/src/main/java/com/czg/config/RedisCst.java

@@ -12,4 +12,6 @@ public interface RedisCst {
 
 
     String SMS_CODE = "sms:code:";
+    // 店铺会员动态支付码
+    String SHOP_USER_DYNAMIC_CODE = "shop:user:dynamic:code:";
 }

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java

@@ -30,4 +30,5 @@ public interface ShopUserService extends IService<ShopUser> {
      */
     Page<ShopUserVipCardDTO> vipCard(long userInfoId);
 
+    String getCode(long userInfoId, long shopId);
 }