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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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

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

    private Long companyId;

    /**