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

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java

@@ -132,7 +132,7 @@ public class JxYhzgbhVo implements Serializable {
     /**
      * 整改人
      */
-    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId")
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "abarbeitung")
     private String abarbeitungName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java

@@ -402,6 +402,7 @@ public class PdMasterServiceImpl extends ServiceImpl<PdMasterMapper, PdMaster> i
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        pdMasterUserService.getBaseMapper().delete(new LambdaQueryWrapper<PdMasterUser>().in(PdMasterUser::getOrdersid, ids));
         return baseMapper.deleteByIds(ids) > 0;
     }