Commit Graph

20 Commits

Author SHA1 Message Date
jjLv 37aa97b3be Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java
#	src/main/java/com/bonus/leader/performance/manager/manager/dao/UserDao.java
#	src/main/resources/mappers/user/newUserMapper.xml
2024-04-26 10:22:36 +08:00
jjLv f57894924a 履职内容 2024-04-26 10:12:40 +08:00
tqzhang 58f8115485 .. 2024-04-25 13:53:46 +08:00
tqzhang ef292505e3 数据报表功能开发 2024-03-07 18:02:55 +08:00
tqzhang 5f710b18a1 组织机构,请假记录等 2024-03-04 14:59:45 +08:00
jjLv 930c838262 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java
#	src/main/java/com/bonus/leader/performance/manager/manager/dao/UserDao.java
#	src/main/java/com/bonus/leader/performance/manager/manager/service/UserService.java
#	src/main/java/com/bonus/leader/performance/manager/manager/service/impl/UserServiceImpl.java
#	src/main/resources/mappers/user/UserMapper.xml
2024-03-01 13:36:45 +08:00
jjLv e5902c01d1 公司管理和pom文件提交 2024-03-01 13:23:31 +08:00
tqzhang ce6189ae9a Merge remote-tracking branch 'origin/main' 2024-02-29 13:02:59 +08:00
tqzhang e9c3b6c123 新增用户管理功能 2024-02-29 13:02:50 +08:00
jjLv c3321a25f9 公司管理和pom文件提交 2024-02-29 09:06:12 +08:00
jjLv fa57161301 公司管理和pom文件提交 2024-02-29 09:02:51 +08:00
tqzhang 2add68003f 添加组织岗位功能,系统公告功能 2024-02-28 09:54:23 +08:00
tqzhang 20464c9090 系统公告功能修改
添加notice,layNotify提示插件
2024-02-27 09:59:46 +08:00
tqzhang 77a13e46cf log文件配置 2024-02-27 09:39:18 +08:00
jjLv aaf7e6edf3 公司管理和pom文件提交 2024-02-27 09:02:44 +08:00
jjLv 13c4fad406 公司管理和pom文件提交 2024-02-27 09:01:13 +08:00
jjLv 301d68876f 公司管理和pom文件提交 2024-02-26 11:20:03 +08:00
jjLv 01303d3dc5 公司管理和pom文件提交 2024-02-26 10:42:30 +08:00
jjLv 46fe5363ed 工具类和layui-v2.9.6提交 2024-02-26 09:46:28 +08:00
jjLv 4c8dcecebb 领导履职系统基本框架内容提交 2024-02-26 09:20:57 +08:00