From 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 17 七月 2025 20:38:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 7f4bc94..b3abea7 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -344,20 +344,11 @@ /** * 閫夋嫨鐢ㄦ埛 * @param equipmentCode 閫夋嫨鐨勮澶嘔D - * @param productionId 閫夋嫨鐨勮溅闂碔D + * @param factoryOrgCode 閫夋嫨鐨勪腑蹇冧俊鎭� * @param positionCode 宀椾綅缂栧彿 * @return */ - List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode); - - /** - * 閫夋嫨鐢ㄦ埛 - * @param equipmentCode 閫夋嫨鐨勮澶嘔D - * @param factoryId 閫夋嫨鐨勮溅闂碔D - * @param positionCode 宀椾綅缂栧彿 - * @return - */ - List<UserSelector> selectOperatorFactoryList(String equipmentCode, String factoryId, String positionCode); + List<UserSelector> selectOperatorList(String equipmentCode, String factoryOrgCode, String positionCode); /** * 閫夋嫨鐢ㄦ埛 -- Gitblit v1.9.3