Commit Graph

5672 Commits

Author SHA1 Message Date
bc6cdecb23 Merge remote-tracking branch 'origin/feature/sub-table' 2023-11-30 20:49:37 +08:00
58b901a8c1 !769 fix:修复 vue2 代码生成后 api 导入路径不正确的问题
Merge pull request !769 from puhui999/feature/sub-table
2023-11-30 12:48:51 +00:00
103e38b82c Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table 2023-11-29 18:57:31 +08:00
25595a13f4 fix:修复 vue2 代码生成后 api 导入路径不正确的问题 2023-11-29 18:57:09 +08:00
7724d6e830 !765 Vue2 + Element UI 代码生成器
Merge pull request !765 from 芋道源码/feature/sub-table
2023-11-28 12:28:30 +00:00
d3a565f011 !761 代码生成:vue2 代码模版格式调整;代码生成:准备 CodegenEngineVue2Test 所需测试文件
Merge pull request !761 from puhui999/feature/sub-table
2023-11-28 12:26:50 +00:00
b79f6a8859 !764 返回使用过优惠券逻辑---->状态字段取错了
Merge pull request !764 from Ai3_刘小龙/N/A
2023-11-28 12:25:05 +00:00
7b587a79ca 返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
2023-11-28 09:16:58 +00:00
c437201236 代码生成:CodegenEngineVue2Test 所需测试文件 2023-11-27 21:15:32 +08:00
b4d16b368d Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table 2023-11-27 21:07:45 +08:00
5ebebf1579 代码生成:vue2 代码模拟格式调整 2023-11-27 21:05:41 +08:00
df51a678eb code review:vue2 主子表的生成 2023-11-27 17:09:53 +08:00
12bcee2a72 !734 代码生成:重构 vue2 代码生成模版,使用 async await 优化代码层次,适配树表和主子表
Merge pull request !734 from puhui999/feature/sub-table
2023-11-27 08:53:41 +00:00
6d228828f4 application-local.yaml 恢复 2023-11-27 16:34:55 +08:00
4f42e7ca68 代码生成:Vue2 界面:修正 $refs 2023-11-27 16:31:06 +08:00
86160f40de 代码生成:重构 vue2 代码生成模版,使用 async await 优化代码层次 2023-11-27 16:30:30 +08:00
e4378e5628 修复 WxPayOrderNotifyV3Result 的重命名 2023-11-26 19:24:11 +08:00
b580356051 !753 优化对 dameng 工作流的适配
Merge pull request !753 from 芋道源码/feature/bpm-dameng
2023-11-26 11:21:19 +00:00
81f1800f40 优化对 dameng 工作流的适配 2023-11-26 19:19:31 +08:00
d07869f461 !723 feat: 达梦flowable 6.8适配
Merge pull request !723 from dhb52/master
2023-11-26 10:55:13 +00:00
a1e6348a37 移除 weixin starter 组件,直接改成 wxjava starter 2023-11-26 17:08:16 +08:00
ee25b8aedb !752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
2023-11-26 03:42:16 +00:00
0bf24c6d16 使用 spring-boot-starter-justauth 替代原本 social starter 2023-11-26 11:39:29 +08:00
f2ff30e465 优化 error-code 加载逻辑,失败不影响启动 2023-11-25 23:00:31 +08:00
6d7491fb02 !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 22:34:08 +08:00
6b3a54c8df !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 22:28:05 +08:00
bb06c11405 更新 README.md,增加主子表、WebSocket 的说明 2023-11-25 22:26:23 +08:00
c7ab595460 简化 yudao-ui 目录 2023-11-25 22:05:57 +08:00
bd91276155 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2023-11-25 20:44:36 +08:00
ae763f727f !749 增加 WebSocket 的全新支持
Merge pull request !749 from 芋道源码/feature/websocket
2023-11-25 11:31:02 +00:00
d4bc6ce52d !742 mysql脚本的菜单数据中promotion:combination-activity:query后多个tab
Merge pull request !742 from PeterChina/master-pr
2023-11-24 11:57:46 +00:00
a597eb17d4 websocket:修复 RedisWebSocketMessageConsumer 注册失效的问题 2023-11-24 18:56:19 +08:00
0233b092b8 websocket:重新封装 websocket 组件,支持 sender 广播 2023-11-24 00:32:52 +08:00
be20178f12 Merge remote-tracking branch 'upstream/master' 2023-11-23 22:44:03 +08:00
1941a7b3e6 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
6a61db8508 security: query string 支持传递 token 参数,解决 ws token 认证 2023-11-22 23:02:59 +08:00
0955ad0fc0 promotion:combination-activity:query后多个tab 2023-11-22 09:22:40 +08:00
41c324acc3 !741 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
Merge pull request !741 from 芋道源码/feature/sms-op
2023-11-21 15:34:58 +00:00
edea17e781 Merge remote-tracking branch 'upstream/master' 2023-11-21 23:19:49 +08:00
7506a1b012 sms:移除 sendCode、sendMsg 字段 2023-11-21 22:53:57 +08:00
6f135303d8 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2023-11-21 22:14:07 +08:00
3d2022e31f 代码生成:完善 vue2 代码生成单元测试 2023-11-21 16:22:16 +08:00
c50d27f5cb 代码生成:完善 vue2 模版,适配树表和主子表 2023-11-21 11:58:04 +08:00
80db28ee5b 代码生成:重构 vue2 模版,适配树表和主子表 2023-11-21 10:49:43 +08:00
822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter 2023-11-20 23:27:41 +08:00
737ea4635c Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
2023-11-20 09:57:24 +08:00
827897807f 提升启动速度 2023-11-19 18:46:16 +08:00
e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
2023-11-19 18:39:55 +08:00
7f75f0abfc bpm:code review 指定审批人 2023-11-19 18:28:00 +08:00
6fd8d0095c Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro 2023-11-19 18:17:28 +08:00