Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 beeda8df0023376dbb2021148a021731dc4aedb0

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

@@ -84,6 +84,8 @@

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

    String ACTIVITY_SE_ERROR = "开始时间不能大于结束时间";

    String ACTIVITY_GOODS_NULL = "商品已被抢完";

    String ACTIVITY_GOODS_BEYOND = "超出商品购买限制";