Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

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

@@ -179,7 +179,7 @@ public class SurveyInformationServiceImpl
 						&& PowerStationProcessStateEnum.不通过.getName().equals(powerStation.getProcessStatus())) {
 
 				} else {
-					throw new BadRequest("勘察中，请稍后再试！");
+					throw new BadRequest("此数据已被其他人操作，请返回重新刷新！");
 				}
 
 			}