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

jyy

2021-04-21 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8

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

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

    private Long companyId;

    /**