Commit Graph

121 Commits

Author SHA1 Message Date
chenbowen
ce8e06d2a3 修复 api 添加 requestmapping 导致启动冲突 2025-10-17 15:34:48 +08:00
chenbowen
a53371a2a3 Merge remote-tracking branch 'base-version/main' into dev 2025-10-15 18:10:33 +08:00
chenbowen
957c87bef6 1.新增 dept 分页 feignApi 2025-10-15 11:59:26 +08:00
chenbowen
c0a2e10fcc Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-gateway/src/main/resources/application.yaml
#	zt-module-rule/zt-module-rule-server/src/main/java/com/zt/plat/module/rule/framework/liteflow/component/action/DataSetComponent.java
#	zt-module-rule/zt-module-rule-server/src/main/java/com/zt/plat/module/rule/framework/liteflow/component/base/BaseRuleComponent.java
2025-10-15 09:49:45 +08:00
chenbowen
c0dc0823b6 1.规范增量 SQL 文件命名
2.新增数据总线模块(未完成)
3.新增规则模块(未完成)
4.新增组织编码与外部系统组织编码映射关系表
5.补全 e 办单点登录回调逻辑
2025-10-15 08:59:57 +08:00
chenbowen
88e2766b97 Merge remote-tracking branch 'base-version/main' into dev 2025-09-28 16:37:38 +08:00
qianshijiang
952fde209a 1. 流程枚举状态补充方法返回对应枚举
2. 新增获得指定用户的公司部门信息携带 Code
2025-09-28 16:19:48 +08:00
chenbowen
ecd4e6a020 Merge remote-tracking branch 'base-version/main' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java
2025-09-28 00:41:22 +08:00
chenbowen
47f777d89c 1. 升级 3.0.40
新增 bpm api
新增登录页面区分内外部用户以及 e 办统一认证逻辑
2025-09-28 00:08:55 +08:00
chenbowen
6e213894b6 Merge remote-tracking branch 'base-version/main' into test
# Conflicts:
#	pom.xml
#	zt-dependencies/pom.xml
2025-09-25 19:25:47 +08:00
chenbowen
ea04d0dee6 1. 升级 3.0.38
补全业务附件表缺失的 api
 支持 api 获取附件二进制数据
 新增业务附件表状态信息
 补全部分存在嵌套结构的 bpm api 缺失数据
2025-09-25 19:24:06 +08:00
chenbowen
029a63876d Merge remote-tracking branch 'base-version/main' into test 2025-09-24 14:23:56 +08:00
chenbowen
0c17191bc4 1. 新增根据 fileId 获取 onlyoffice token 接口 2025-09-24 14:23:20 +08:00
chenbowen
f5f82229f3 Merge remote-tracking branch 'base-version/main' into dev 2025-09-23 10:17:18 +08:00
chenbowen
fab444aa8c 1. 组件名存在重复的报错返回前端 2025-09-23 10:16:22 +08:00
chenbowen
6280db3f29 Merge remote-tracking branch 'base-version/main' into dev 2025-09-22 18:09:52 +08:00
chenbowen
9bcf365767 1. 优化角色部门权限分配时的部门加载效果 2025-09-22 18:01:59 +08:00
chenbowen
516fdb6fa0 1. 合并base改包代码 2025-09-22 15:10:53 +08:00
chenbowen
386d47fde1 1. 统一包名修改 2025-09-22 14:53:45 +08:00
chenbowen
0d46897482 1. 统一包名修改 2025-09-22 11:55:27 +08:00
chenbowen
2a2fe74e78 1. 手动合并存在重复被合并的文件,并统一包名 2025-09-22 03:27:28 +08:00