解决文件冲突代码

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java

@@ -32,11 +32,11 @@ public class PmsLedgerStaticDTO implements Serializable {
     /**
      * 根据单位统计监测点数量
      */
-    private HashMap<String,List<PmsSimpleDTO>> monitorStatisticsByDept;
+    private List<List<PmsSimpleDTO.PmsSimpleOrg>> monitorStatisticsByDept;
 
     /**
-     *根据单位统计终端数量
+     * 根据单位统计终端数量
      */
-    private HashMap<String,List<PmsSimpleDTO>> terminalStatisticsByDept;
+    private List<List<PmsSimpleDTO.PmsSimpleOrg>> terminalStatisticsByDept;
 
 }