Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

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

@@ -90,6 +90,8 @@

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

    String ACTIVITY_DEL = "活动已被删除";

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

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