Commit Graph

37 Commits

Author SHA1 Message Date
nyoung
3adaa2e822 1 2024-09-04 22:34:29 +08:00
nyoung
e2111c6d12 1 2024-09-01 21:13:39 +08:00
nyoung
e188fbd3a2 1 2024-08-31 00:08:49 +08:00
PQZ
c65f5ac793 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java
2024-08-29 12:44:05 +08:00
PQZ
289453dd1f 1 2024-08-29 12:42:53 +08:00
nyoung
3f6026918d 检测 2024-08-28 20:54:03 +08:00
xiao-fajia
a084d5987a Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-28 20:40:08 +08:00
xiao-fajia
7bdc6a79d7 档案管理2 2024-08-28 20:40:01 +08:00
PQZ
8ac68b20b7 1 2024-08-28 19:04:41 +08:00
PQZ
247250713e 1 2024-08-28 16:56:56 +08:00
PQZ
59e049c2ef 1 2024-08-28 15:24:25 +08:00
PQZ
c8fe517532 1 2024-08-28 15:02:04 +08:00
xiao-fajia
889b9b6b2c 救援新功能1/2 2024-08-26 16:08:24 +08:00
赵旭
ca31756912 jx-02 2024-08-23 01:09:09 +08:00
xiao-fajia
2b0327792b 救援菜单配置 2024-08-19 14:29:27 +08:00
zhuchunyun
2b28577050 ‘救援’ 2024-08-16 13:32:42 +08:00
xiao-fajia
de5f19d3d2 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-14 20:01:49 +08:00
xiao-fajia
b9e17e0568 员工加角色(查询、交接待完善) 2024-08-14 20:01:43 +08:00
Vinjor
1b42f4e3ad 资产存放位置完成 2024-08-14 17:50:49 +08:00
xiao-fajia
b5d140498f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
 Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
2024-08-14 11:19:59 +08:00
Vinjor
40819a9933 sysuser表区分客户还是员工 2024-08-14 10:19:11 +08:00
xiao-fajia
819430bc73 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-13 18:38:37 +08:00
Vinjor
a0a4789424 创建用户账号和密码的长度限制 2024-08-13 17:17:45 +08:00
xiao-fajia
94db55c584 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
 Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
2024-08-13 10:42:07 +08:00
xiao-fajia
d6d271edda 企业管理-员工信息 2024-08-13 10:40:22 +08:00
Vinjor
b784d739bc 数据权限 2024-08-12 15:08:07 +08:00
Vinjor
7e263447be 部门添加祖级列表字段 2024-08-07 16:40:54 +08:00
Vinjor
199531c95f 分类字典 2024-08-07 16:08:06 +08:00
Vinjor
2cf0b382af 分类字典 2024-08-07 15:54:58 +08:00
PQZ
743f529c31 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-07 12:00:52 +08:00
PQZ
0b05d6399b 调整 2024-08-07 12:00:49 +08:00
Vinjor
f6b29d08e8 积木报表打包问题 2024-08-07 11:37:48 +08:00
Vinjor
287dc7a8ec 企业管理完成 2024-08-03 17:59:07 +08:00
Vinjor
20ad22237f 服务套餐管理功能 2024-08-02 11:57:42 +08:00
Vinjor
62d5cdff1c 新建租户自动创建租户顶级部门,更新租户自动更新顶级部门名称,登录页根据后缀tenantCode值自动获取登录租户 2024-08-01 18:02:07 +08:00
Vinjor
3178d9d7da 代码包调整 2024-07-31 11:23:34 +08:00
Vinjor
4653c6d75a first commit 2024-07-30 15:10:00 +08:00