chenbowen
|
b245bed7da
|
Merge branch 'dev' into test
|
2026-01-06 15:24:46 +08:00 |
|
chenbowen
|
b86a9a2811
|
Merge remote-tracking branch 'base-version/main' into dev
|
2026-01-06 15:24:13 +08:00 |
|
chenbowen
|
797cd2abd9
|
1. 修复 deptignore 注解会导致的空指针问题
2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度
|
2026-01-06 09:18:47 +08:00 |
|
chenbowen
|
5d547acfea
|
Merge remote-tracking branch 'refs/remotes/base-version/test' into dev
|
2025-12-30 18:28:57 +08:00 |
|
ranke
|
5f90e7e417
|
Merge branch 'test' into test-dsc
* test:
新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551
1. 补全基准的菜单 sql 语句
|
2025-12-30 18:18:18 +08:00 |
|
ranke
|
b81e8c6df2
|
新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551
|
2025-12-30 18:07:58 +08:00 |
|
chenbowen
|
580d1d9047
|
1. 补全基准的菜单 sql 语句
|
2025-12-29 11:13:29 +08:00 |
|
chenbowen
|
d9ab32165f
|
Merge branch 'dev' into test
|
2025-12-25 10:47:38 +08:00 |
|
chenbowen
|
b698706dad
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-25 10:47:20 +08:00 |
|
chenbowen
|
09c726d51b
|
1. 避免无登录的操作无法记录日志的情况
2. 短信登录可以不传递租户信息
|
2025-12-25 10:46:45 +08:00 |
|
chenbowen
|
48660f75cf
|
Merge branch 'dev' into test
|
2025-12-23 17:53:25 +08:00 |
|
chenbowen
|
5843e2eb7a
|
Merge remote-tracking branch 'refs/remotes/base-version/main' into dev
|
2025-12-23 17:52:55 +08:00 |
|
chenbowen
|
82ea639cdd
|
1. 去掉凭证唯一约束
|
2025-12-23 16:36:35 +08:00 |
|
chenbowen
|
2a16656b7d
|
Merge branch 'dev' into test
|
2025-12-22 13:47:37 +08:00 |
|
chenbowen
|
2efa78ed74
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-22 13:47:15 +08:00 |
|
chenbowen
|
633772f8b1
|
1. 修正初始化 sql 简化内容
|
2025-12-18 14:46:12 +08:00 |
|
chenbowen
|
b96d40b8d1
|
Merge branch 'dev' into test
|
2025-12-18 13:21:54 +08:00 |
|
chenbowen
|
c86a765b73
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-18 13:21:03 +08:00 |
|
chenbowen
|
870c6a5f88
|
1. 统一 iwork 的同步组织代码生成逻辑
|
2025-12-18 13:19:39 +08:00 |
|
chenbowen
|
660e0cf401
|
Merge branch 'dev' into test
|
2025-12-17 20:18:58 +08:00 |
|
chenbowen
|
9bc519aa0d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 20:18:42 +08:00 |
|
chenbowen
|
4082e61874
|
1. 调整初始化脚本
|
2025-12-17 20:18:13 +08:00 |
|
chenbowen
|
4fc05fc094
|
Merge branch 'dev' into test
|
2025-12-12 10:14:18 +08:00 |
|
chenbowen
|
1706a70499
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-framework/zt-spring-boot-starter-test/src/main/java/com/zt/plat/framework/test/core/ut/BaseDbUnitTest.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
|
2025-12-12 10:05:36 +08:00 |
|
chenbowen
|
cae0b9e4af
|
1. 新增 api 绑定客户凭证进行权限校验
2. 去除 api 定义的缓存策略
3. 新增短信渠道
4. 新增用户信息模糊查询
5. 修复全局的单元测试
|
2025-12-12 10:03:10 +08:00 |
|
chenbowen
|
39a82b6537
|
Merge branch 'dev' into test
# Conflicts:
# zt-module-databus/zt-module-databus-server/src/main/resources/application-dev.yml
|
2025-12-09 16:25:53 +08:00 |
|
chenbowen
|
577df1c6e7
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-09 16:25:18 +08:00 |
|
chenbowen
|
29e0c7da14
|
1. 新增 api 绑定客户凭证进行权限校验
|
2025-12-09 16:24:17 +08:00 |
|
chenbowen
|
5915f652ed
|
Merge branch 'dev' into test
|
2025-12-05 11:54:06 +08:00 |
|
chenbowen
|
5ce3724798
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-05 11:53:50 +08:00 |
|
chenbowen
|
f4211f0011
|
新增公司部门切换菜单权限
|
2025-12-05 11:52:58 +08:00 |
|
chenbowen
|
97abbd1db2
|
Merge branch 'dev' into test
|
2025-12-02 15:11:41 +08:00 |
|
chenbowen
|
4f95272ca8
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
|
2025-12-02 15:10:24 +08:00 |
|
chenbowen
|
ee9bc438b5
|
1. 剔除外域 url
|
2025-12-02 14:10:47 +08:00 |
|
chenbowen
|
ecf1b5f1e7
|
Merge branch 'dev' into test
|
2025-12-02 11:16:57 +08:00 |
|
chenbowen
|
e2c3702ae5
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-02 11:16:34 +08:00 |
|
chenbowen
|
a689a3ffe4
|
1. 修复用户信息未同步人力资源编号的问题
|
2025-12-02 11:13:33 +08:00 |
|
chenbowen
|
fc0428e7b5
|
Merge branch 'dev' into test
|
2025-12-01 10:21:55 +08:00 |
|
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
|
837e09941a
|
Merge branch 'dev' into test
|
2025-11-26 20:14:04 +08:00 |
|
chenbowen
|
256bf22a10
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 20:12:46 +08:00 |
|
chenbowen
|
06909fafea
|
当前登录用户新增公司编码与部门编码属性
|
2025-11-26 20:01:34 +08:00 |
|
chenbowen
|
6b3453e4ee
|
Merge branch 'dev' into test
|
2025-11-18 10:59:55 +08:00 |
|
chenbowen
|
633e430f46
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:59:29 +08:00 |
|
chenbowen
|
266eb45e00
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:03:34 +08:00 |
|
chenbowen
|
270132b7c1
|
1. 组织物料状态字段补充
2. template 模块不再参与编译
|
2025-11-05 17:20:00 +08:00 |
|
chenbowen
|
e6fe57533e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-03 14:21:25 +08:00 |
|
chenbowen
|
b98f605dfd
|
1. 优化 bpm 流程中所有关于用户选择，部门选择的组件
2. 优化 api 调试提示，优化 api 调用因为链接复用导致的链接被拒绝问题
3. 新增字典数据导入功能
|
2025-11-03 14:20:13 +08:00 |
|
chenbowen
|
42f61158c6
|
1. 补全工艺工序页面菜单权限
|
2025-10-31 09:49:29 +08:00 |
|