Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java

@@ -95,8 +95,9 @@ public interface ScreenProjectProcessService extends BaseService<ScreenProjectPr
      */
     void delete(String[] ids);
 
+    void collect(ScreenCollFormDTO<ScreenProjectProcessFormDTO> param);
+
     boolean checkIfHistoricalDataExists(String customerId);
 
     void insertBatch(List<ScreenProjectProcessDTO> list,String customerId,String dateId);
-    void collect(ScreenCollFormDTO<ScreenProjectProcessFormDTO> param);
 }