Merge remote-tracking branch 'origin/master'

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicUnitInfoResultDTO.java

@@ -60,6 +60,8 @@ public class EpidemicUnitInfoResultDTO implements Serializable {
      */
     private String plotName;
 
+    private String gridId;
+
     /**
      * 楼栋名称
      */