合并分支 'qa' 到 'master'

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

@@ -97,6 +97,14 @@ public enum RCode implements StatusCode {
     NOT_PFZP_PHOTO_ERROR(4030,"配发赠品照片未上传"),
     NOT_GFQ_PHOTO_ERROR( 4031,"高峰期在岗照片未上传"),
     NOT_SCBBWL_PHOTO_ERROR( 4032,"试吃必备物料照片未上传"),
+    NOT_BLACK_DUCK_FLAVOR_ERROR( 4033,"配发试吃品是否有黑鸭口味未填写"),
+    NOT_BLACK_DUCK_TASTING_NUM_ERROR(4034,"配发黑鸭试吃品（根）未填写"),
+    NOT_BRAISED_TASTING_NUM_ERROR(4035, "配发卤香试吃品（根）未填写" ),
+    NOT_GIFT_NUM_ERROR(4036, "赠品个数未填写" ),
+    NOT_PROMOTION_SALES_ERROR(4037, "推广活动销额（元）未填写"),
+    NOT_BLACK_DUCK_SALES_ERROR(4038, "黑鸭销售（元）未填写"),
+    NOT_GIFT_SALES_ERROR(4039, "礼盒+礼袋销量（个）未填写"),
+
 
 
     /**
@@ -129,8 +137,7 @@ public enum RCode implements StatusCode {
      */
     TENCENT_SMS_ERROR(3500, "短信发送失败"),
     TENCENT_SMS_REPETITION(3501, "短信已发送"),
-    TENCENT_SMS_PHONE_CODE_ERROR(3502, "验证码错误"),
-    ;
+    TENCENT_SMS_PHONE_CODE_ERROR(3502, "验证码错误");
 
 
     private int code;
@@ -138,6 +145,6 @@ public enum RCode implements StatusCode {
 
     RCode(int code, String msg) {
         this.code = code;
-        this.msg = msg;
+        this.msg =msg;
     }
 }