Commit Graph

8210 Commits

Author SHA1 Message Date
Owen 80ad261000 Feat: Api 联通 + 地区整理 2024-12-27 10:41:14 +08:00
Owen 8ac418984a Feat: Api 联通 + 地区整理 2024-12-26 22:05:28 +08:00
Owen 598d68cab3 Feat: Api 联通 + 地区整理 2024-12-26 18:22:06 +08:00
Owen 4df3bfb6b5 Merge remote-tracking branch 'origin/develop' into develop 2024-12-26 17:25:31 +08:00
Owen f334360215 Feat: Api 联通 + 地区整理 2024-12-26 17:25:18 +08:00
Damonny 056929d289 update: order dict sql 2024-12-26 15:51:40 +08:00
Owen b74e0eca7e Feat: Api 联通 + 地区整理 2024-12-26 15:47:50 +08:00
Owen 0d8cb4e01e Feat: Api 广州电信 2024-12-25 20:59:48 +08:00
Owen ff88b58618 Feat: Api 广州电信 2024-12-24 13:40:18 +08:00
Damonny e0d6de9bf0 update: sql脚本调整 2024-12-23 17:46:18 +08:00
Damonny 14fdc2464c update: sql脚本更改 2024-12-23 17:42:19 +08:00
Owen 101625fa00 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2024-12-23 17:34:38 +08:00
Owen c2b416a5f8 Feat: Code gen V3 ok 2024-12-23 17:34:04 +08:00
Damonny 06fa269e6c init:初始化订单来源列表查询 2024-12-23 02:43:17 +08:00
Owen 5907ab9605 Feat: Code gen V3 ok 2024-12-23 00:01:22 +08:00
Owen 32cadcbeae Feat: Code gen V3 ok 2024-12-20 17:52:12 +08:00
Damonny 398395dd4e init:初始化订单列表查询 2024-12-18 15:21:51 +08:00
Owen 0fe9c39bb3 Feat: Code gen V3 ok 2024-12-17 15:10:34 +08:00
Owen 97e3380e3a Feat: Code gen V3 ok 2024-12-16 18:07:59 +08:00
Owen 8b5603a1f4 Feat: Code gen V2 ok 2024-12-15 17:03:01 +08:00
Owen a42bf5ce1d Feat: Code gen V2 ok 2024-12-15 17:02:57 +08:00
Owen ea0c6d3e33 Feat: Code gen product2 2024-12-15 16:12:51 +08:00
Owen 2a23f12188 Feat: Code gen V1 2024-12-15 14:40:51 +08:00
Owen 3aefaca837 Feat: haoka product generate ok2 2024-12-15 13:51:43 +08:00
Owen 0ad6ab7304 Feat: haoka product generate ok1 2024-12-15 12:55:00 +08:00
Owen 9d517160f7 Feat: haoka product init sql 2024-12-15 04:20:25 +08:00
Owen 210f215716 Feat: haoka db/migration 2024-12-15 03:39:22 +08:00
Owen 09b12dc3a2 Feat: haoka db/migration 2024-12-15 03:35:43 +08:00
Owen 2769c0ffa5 Feat: haoka db/migration 2024-12-15 03:31:18 +08:00
Owen f1a6916015 Feat: haoka db/migration 2024-12-14 18:03:10 +08:00
Owen 4fd4b8a9b0 Feat: haoka init demo 2024-12-14 15:06:22 +08:00
Owen 9f8622656a Feat: haoka init demo 2024-12-14 15:02:19 +08:00
Owen cbc1b5cec6 Feat: haoka init demo 2024-12-10 15:00:45 +08:00
Owen 14a926b435 init local.yaml 2024-12-06 19:08:29 +08:00
芋道源码 3f22e64b77
!1145 【枚举值错误】update cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java.
Merge pull request !1145 from 山野羡民/N/A
2024-12-02 14:36:44 +00:00
山野羡民 c54132fc77
【枚举值错误】update cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
2024-12-02 09:51:39 +00:00
芋道源码 df4cc6667d
!1134 同步商城的客服优化、门店自提优化
Merge pull request !1134 from 芋道源码/develop
2024-11-25 11:31:50 +00:00
YunaiV 87cee4628a 【代码优化】商城:优化分销提现的逻辑(余额) 2024-11-25 19:30:55 +08:00
YunaiV 0552f86018 README:增加工作流的演示图片 2024-11-23 10:16:56 +08:00
芋道源码 62379641fa
!1133 bpm 仿钉钉/飞书模式
Merge pull request !1133 from 芋道源码/feature/bpm
2024-11-23 02:14:34 +00:00
YunaiV c616066a60 README:增加工作流的演示图片 2024-11-23 10:08:19 +08:00
YunaiV 5b34e0bd51 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	sql/mysql/bpm_update.sql
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java
2024-11-22 20:41:00 +08:00
YunaiV 4d4df7bd0c 【代码优化】websocket:找不到 session 时,日志级别从 info 到 debug 级别 2024-11-22 20:33:31 +08:00
YunaiV 4a23872598 【代码优化】工作流:优化 form 分配人的逻辑 2024-11-19 21:04:08 +08:00
YunaiV 396051b41e 【代码合并】商城:合并最新的 master-jdk17 分支 2024-11-19 09:30:40 +08:00
YunaiV c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
2024-11-19 09:26:44 +08:00
芋道源码 b48842091c
!1129 解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Merge pull request !1129 from 杨宇庆/N/A
2024-11-19 01:09:01 +00:00
芋道源码 053fe9c7a8
!1130 【功能完善】商城:客服消息查询 pageSize 改 limit
Merge pull request !1130 from puhui999/develop2
2024-11-19 01:05:53 +00:00
puhui999 c501172694 【功能完善】商城:客服消息查询 pageSize 改 limit 2024-11-18 17:20:46 +08:00
杨宇庆 f782e3a9af
解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-11-18 08:06:52 +00:00