Merge branch 'dev_gridmember_fusion' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@@ -258,6 +258,10 @@ public class StatsUserServiceImpl implements StatsUserService {
                     iterator.remove();
                 }
             }
+            //批量新增或修改数据
+            if (!CollectionUtils.isEmpty(p)) {
+                dataStatsDao.saveOrUpGmUploadData(p);
+            }
         }
 
     }