Merge branch 'dev_optimize' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -1597,6 +1597,7 @@ public class WorkActServiceImpl implements WorkActService {
         }else{
             logger.warn("根据agencyId查询组织信息失败，agencyId={}",formDTO.getSponsorId());
         }
+        entity.setGridId(formDTO.getGridId());
         entity.setActId(actInfoEntity.getId());
         entity.setTitle(actInfoEntity.getTitle());
         entity.setTarget(actInfoEntity.getTarget());