Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java

@@ -43,6 +43,8 @@
    /**
     * 订单划扣时间
     */
    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    private Date consumeTime;

    /**
@@ -62,9 +64,7 @@
     * 床位
     */
    private Long bedId;
    /**
     * 床位
     */

    private Long companyId;

    /**