Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-08-26 b3942f278045cf74410d81a62ded4696f22d170d

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java

@@ -80,6 +80,8 @@

    String VERIFY_SHOP_ERROR = "该核销码不适用于本店铺";

    String BLINDING_VERIFY_SHOP_ERROR = "绑定的店铺和优惠券所属店铺不一致";

    String ACTIVITY_NO_START = "活动还未开始";

    String ACTIVITY_END = "活动已经结束";