Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -659,7 +659,6 @@ public class BasicGridAcceptanceServiceImpl
 					}
 				}
 			}
-			return	CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 		}
 
 		if (hygfRectificationOrder.getSequenceNbr() != null ){

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -1369,7 +1369,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					}
 				}
 			}
-			return	CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 		}
 		//修改电站状态
 		if (addorSubmit.equals("0")){