合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/result/basedata/RCode.java

@@ -130,6 +130,7 @@ public enum RCode implements StatusCode {
     ACTIVITY_ID_IS_START(5014,"「%s」号计划已被促销员执行；"),
     ACTIVITY_PLAN_ID_NOT_DELETE(5015,"「%s」号已超上班时间1小时，不可修改；"),
     ACTIVITY_PLAN_DATA_ERROR(5016,"活动日期必需是次日 至 月底"),
+    ACTIVITY_PLAN_DATE_CONFLICT(5017,"该日期已存在其他活动计划"),
 
 
     /**