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

jyy

2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca

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

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

    private Long companyId;

    /**