 bupengxiang
|
3cd351adc5
|
[新增] 组织管理模块
|
2023-05-06 15:54:31 +08:00 |
|
|
xuetao.li
|
6c81523aea
|
Merge remote-tracking branch 'origin/lixuetao' into lixuetao
|
2023-05-06 09:27:36 +08:00 |
|
|
xuetao.li
|
21b4d01567
|
添加TODO标识
|
2023-05-06 09:27:27 +08:00 |
|
|
bupengxiang
|
dd3c7a2554
|
[修改] 登录403问题
|
2023-04-28 18:21:01 +08:00 |
|
|
bupengxiang
|
9b9457b9dd
|
[修改] 监控流程 调整处理人 永久
|
2023-04-28 10:10:44 +08:00 |
|
|
bupengxiang
|
6e2fc642d3
|
[修改] 流程发起后 删除用户 回显bug
|
2023-04-27 18:02:30 +08:00 |
|
|
xuetao.li
|
62f0a139b6
|
Merge remote-tracking branch 'origin/caihaohan' into lixuetao
# Conflicts:
# adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
|
2023-04-25 21:18:11 +08:00 |
|
|
bupengxiang
|
af64620166
|
[新增] 权限申请流程 及 工作台的接口 开发完毕
|
2023-04-25 21:05:37 +08:00 |
|
|
bupengxiang
|
867f703968
|
[新增] 工作流工作台 及权限申请流程
|
2023-04-24 21:55:16 +08:00 |
|
|
bupengxiang
|
ab65fa2fb7
|
[修改] 修改用户查询sql
|
2023-04-24 11:45:36 +08:00 |
|
|
bupengxiang
|
2d1b1d2066
|
[合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突
|
2023-04-24 11:18:57 +08:00 |
|
|
bupengxiang
|
6d3e7fe66e
|
Merge branch 'caihaohan' into lixuetao
# Conflicts:
# adc-da-main/target/classes/application-dev.properties
# adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
# adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class
# adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class
# adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class
# adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class
# adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
# adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
# adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
# adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
# adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
# adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
# adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class
# adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml
# pom.xml
|
2023-04-24 11:15:18 +08:00 |
|
|
bupengxiang
|
22221173fe
|
工作流 修改一些todo
|
2023-04-20 18:02:56 +08:00 |
|
|
xuetao.li
|
ab18d499c2
|
根据id获取多个用户信息的接口完成
|
2023-04-19 18:07:37 +08:00 |
|
|
bupengxiang
|
9092f1a38f
|
工作流 启动
|
2023-04-19 17:37:47 +08:00 |
|
|
xuetao.li
|
dbe999143a
|
去掉额外的fk包
|
2023-04-19 16:19:18 +08:00 |
|
|
zer0Black
|
3ae4481ee8
|
工作流引入【未完全修复完毕】
|
2023-04-19 15:15:02 +08:00 |
|
|
xuetao.li
|
4ce40d9553
|
修改以前的垃圾代码
|
2023-04-18 15:46:20 +08:00 |
|
|
xuetao.li
|
e796a0000e
|
同步基本框架处理完毕
|
2023-04-18 11:53:45 +08:00 |
|
|
xuetao.li
|
5244ba8245
|
同步日志表相关实体补充
|
2023-04-18 10:15:40 +08:00 |
|
|
xuetao.li
|
551c7583a8
|
组织机构controller处理完毕
|
2023-04-18 09:49:46 +08:00 |
|
|
xuetao.li
|
78e8758902
|
去掉多余的实体文件
添加组织机构相关的实体文件
|
2023-04-18 09:05:34 +08:00 |
|
|
xuetao.li
|
cb12e28480
|
添加IAM用户的实体
|
2023-04-17 18:08:00 +08:00 |
|
|
xuetao.li
|
065597b0da
|
添加IAM部门的实体
|
2023-04-17 17:58:01 +08:00 |
|
|
xuetao.li
|
61c65f1b50
|
修复工作流全部错误完成（都添加了TODO）
|
2023-04-17 17:51:27 +08:00 |
|
|
zer0Black
|
b40519a302
|
工作流引入【未完全修复完毕】
|
2023-04-17 13:49:01 +08:00 |
|
|
zer0Black
|
a28bf76f5b
|
删掉不要的代码
|
2022-09-05 15:23:24 +08:00 |
|
|
zer0Black
|
cb1312ac79
|
注释掉不要的代码
|
2022-09-05 15:13:57 +08:00 |
|
|
zer0Black
|
997b173749
|
去除一些不需要的表
|
2022-08-31 14:42:06 +08:00 |
|
|
zer0Black
|
77ca26d6c7
|
初始化
|
2022-08-31 14:06:07 +08:00 |
|