Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -884,6 +884,8 @@ public class Constant {
         OTHERINBOUNDITEM("其他入库明细"),
         INBIUND("入库单"),
         INBIUNDDETAIL("入库单明细"),
+        RECEIPT("回执"),
+        ROOM("空间"),
         ;
 
         private String name;

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -59,7 +59,7 @@ public enum ErrorCodeEnum {
     INVENTORY_QUANTITY_EXCEEDED(11084,"已入库数量加入库中数量已超出订单总数量！"),
     CUSTOMER_SAME_COMPANY_TELEPHONE(8001, "当前电话号码已存在"),
 
-    
+    CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),
     ;
 
     private int code;