chenbowen
|
7fae3203bc
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
# zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
# zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
|
2025-12-01 10:21:34 +08:00 |
|
chenbowen
|
0c22975df0
|
1. 剔除掉多余的文档以及标记
|
2025-11-28 18:12:00 +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
|
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 |
|