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

xyh

2021-06-16 dedb6f26be813caaa0d6ec828d39deaa18fddcb3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngBuildingDO.java

@@ -119,6 +119,5 @@
     */
    private String remark;

    private Long gridId;

    private String gridId;
}