Merge branch 'sprint/S1' into develop

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffUpdateEAIService.java

@@ -50,7 +50,7 @@ public class StaffUpdateEAIService extends AbsEAIService {
         String option = request.getObject("option", String.class);
         List<StaffEntity> staffList = request.getObject("wait_register_personnel", StaffUtil.LIST_ENTITY_STAFF);
         //界面
-        if (OptionEnums.BASIC.getValue().equals(option)){
+        if (StringUtils.isEmpty(option)){
             if (!CollectionUtils.isEmpty(staffList)){
                 //区分是否有id没有则新增
                 Map<Boolean, List<StaffEntity>> collect = staffList.stream().collect(Collectors.groupingBy(item -> StringUtils.isEmpty(item.getId())));