Merge remote-tracking branch 'origin/jd_cons' into jd_cons

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseDO.java

@@ -202,4 +202,9 @@ public class WarehouseDO extends BaseDO implements Serializable {
     */
     private String tzName;
 
+    /*
+    是否开通集运服务
+    */
+    private String isConsService;
+
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseBaseVO.java

@@ -100,4 +100,10 @@ public class WarehouseBaseVO {
     @ApiModelProperty(value = "锁定收货人天数")
     private int lockRecipientDays;
 
+    /*
+    是否开通集运服务，0为否 1为是 默认为0
+     */
+    @ApiModelProperty(value = "是否开通集运服务")
+    private Integer isConsService;
+
 }