From cda1fc94a7400cdcceb5c9e187d9f88aecc52d83 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 16 May 2024 16:48:03 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E5=BC=82=E5=B8=B8=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E3=80=81=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os-admin/src/main/resources/application.yml | 2 +- .../main/resources/vm/vue/index-tree.vue.vm | 2 +- .../src/main/resources/vm/vue/index.vue.vm | 2 +- .../controller/BaseStaffInfoController.java | 100 +++++++++ .../controller/BaseTeamMembersController.java | 109 ++++++++++ .../com/os/mes/base/domain/BaseStaffInfo.java | 175 ++++++++++++++++ .../os/mes/base/domain/BaseTeamMembers.java | 190 ++++++++++++++++++ .../mes/base/mapper/BaseStaffInfoMapper.java | 61 ++++++ .../base/mapper/BaseTeamMembersMapper.java | 61 ++++++ .../base/service/IBaseStaffInfoService.java | 61 ++++++ .../base/service/IBaseTeamMembersService.java | 61 ++++++ .../impl/BaseStaffInfoServiceImpl.java | 90 +++++++++ .../impl/BaseTeamMembersServiceImpl.java | 90 +++++++++ .../mapper/mes/base/BaseStaffInfoMapper.xml | 132 ++++++++++++ .../mapper/mes/base/BaseTeamMembersMapper.xml | 134 ++++++++++++ 15 files changed, 1267 insertions(+), 3 deletions(-) create mode 100644 os-mes/src/main/java/com/os/mes/base/controller/BaseStaffInfoController.java create mode 100644 os-mes/src/main/java/com/os/mes/base/controller/BaseTeamMembersController.java create mode 100644 os-mes/src/main/java/com/os/mes/base/domain/BaseStaffInfo.java create mode 100644 os-mes/src/main/java/com/os/mes/base/domain/BaseTeamMembers.java create mode 100644 os-mes/src/main/java/com/os/mes/base/mapper/BaseStaffInfoMapper.java create mode 100644 os-mes/src/main/java/com/os/mes/base/mapper/BaseTeamMembersMapper.java create mode 100644 os-mes/src/main/java/com/os/mes/base/service/IBaseStaffInfoService.java create mode 100644 os-mes/src/main/java/com/os/mes/base/service/IBaseTeamMembersService.java create mode 100644 os-mes/src/main/java/com/os/mes/base/service/impl/BaseStaffInfoServiceImpl.java create mode 100644 os-mes/src/main/java/com/os/mes/base/service/impl/BaseTeamMembersServiceImpl.java create mode 100644 os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml create mode 100644 os-mes/src/main/resources/mapper/mes/base/BaseTeamMembersMapper.xml diff --git a/os-admin/src/main/resources/application.yml b/os-admin/src/main/resources/application.yml index e5e8c10..19e8f07 100644 --- a/os-admin/src/main/resources/application.yml +++ b/os-admin/src/main/resources/application.yml @@ -13,7 +13,7 @@ ruoyi: # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 - captchaType: math + captchaType: char # 开发环境配置 server: diff --git a/os-generator/src/main/resources/vm/vue/index-tree.vue.vm b/os-generator/src/main/resources/vm/vue/index-tree.vue.vm index ce0ac05..67e79f5 100644 --- a/os-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/os-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -137,7 +137,7 @@ #end #end #end - +