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
|
97bd87de55
|
完善自动填充逻辑，确保公司、部门、岗位等信息在缺失时自动填充
|
2025-09-29 11:49:01 +08:00 |
|
chenbowen
|
1de779ffd6
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-framework/zt-spring-boot-starter-job/src/main/java/com/zt/plat/framework/quartz/config/ZtXxlJobAutoConfiguration.java
|
2025-09-25 12:06:26 +08:00 |
|
chenbowen
|
f33d3f07b8
|
1. xxl-job 设置虚拟用户 0 登录操作
2. Access-Control-Expose-Headers 允许暴露 content-disposition
|
2025-09-25 12:01:19 +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
|
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 |
|