789 Commits

Author SHA1 Message Date
haolj
e23afb299b [fix]修改App中根据字典类型查询字典数据列表(只包含默认租户的数据) 2025-08-27 17:10:17 +08:00
wangqx
03a9967da4 [fix]修改消息的逻辑,将消息通过mq放出来,然后再由消费者发送给腾讯 2025-08-27 10:49:09 +08:00
wangqx
7bb559d294 [fix]修改mq为rockectmq 2025-08-26 09:08:01 +08:00
wangqx
983375f2c7 [fix]修改bug 2025-08-25 14:36:05 +08:00
wangqx
c21d61f4f0 [fix]修改bug 2025-08-25 14:35:44 +08:00
wangqx
b450526775 [fix]修改视频相关 2025-08-21 17:12:02 +08:00
wangqx
b8702f827c [fix]修改视频相关 2025-08-21 15:47:28 +08:00
wangqx
fd06e105bb [fix]使用本地的redis 2025-08-16 15:29:22 +08:00
wangqx
65da753e66 [fix]删除member参数,改为从token中获取 2025-08-16 11:17:18 +08:00
曹佳豪
adb23bb268 修改bug 2025-08-16 11:15:40 +08:00
wangqx
90be00a277 [fix]删除member参数,改为从token中获取 2025-08-16 10:05:59 +08:00
fxh
ccadf33e19 修改商品列表 2025-08-15 19:47:41 +08:00
曹佳豪
e0f6ccace8 Merge remote-tracking branch 'origin/wzj-main' into wzj-main 2025-08-15 19:06:17 +08:00
曹佳豪
af2e269e71 修改bug 2025-08-15 19:05:25 +08:00
wangqx
e2ce1e1211 [feat]增加app轮播接口,增加app会员接口 2025-08-15 17:05:59 +08:00
fxh
2c4ea0c22c Merge remote-tracking branch 'origin/wzj-main' into wzj-main 2025-08-15 16:55:32 +08:00
fxh
f6357bb922 app接口 2025-08-15 16:54:59 +08:00
曹佳豪
b6c6855842 修改bug+迁移app接口 2025-08-15 16:51:03 +08:00
wangqx
580739f2f7 [feat]增加app轮播接口,增加app会员接口 2025-08-15 14:36:39 +08:00
wangqx
777992a096 [feat]修改文章列表。增加app接口 2025-08-15 14:23:34 +08:00
wangqx
7429692522 [feat]开发文章分类和文章 2025-08-14 15:54:49 +08:00
曹佳豪
cc68b15b40 Merge remote-tracking branch 'origin/wzj-main' into wzj-main
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
2025-08-14 15:48:51 +08:00
曹佳豪
9d5b1e109d 修改bug 2025-08-14 15:47:09 +08:00
fxh
9d4e42de60 修改bug 2025-08-14 14:52:55 +08:00
曹佳豪
7d9505bf21 修改视频 2025-08-13 17:29:13 +08:00
fxh
ad580e3f99 Merge remote-tracking branch 'origin/main' into wzj-main
# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java
2025-08-12 14:57:38 +08:00
fxh
4c0efb69bf 修改bug 2025-08-12 09:03:37 +08:00
曹佳豪
32229ab3ef 修改视频bug 2025-08-12 09:02:46 +08:00
fxh
f640fed356 红包功能 2025-08-06 10:04:41 +08:00
曹佳豪
f76af44a0a 租户账户修改 2025-08-06 09:55:15 +08:00
曹佳豪
701efaadea 添加视频缓存和商品缓存和获取 2025-08-01 16:18:50 +08:00
fxh
65198b9cbb 修改启动问题 2025-07-23 18:30:15 +08:00
fxh
525ad3d6db 改造租户 2025-07-23 15:48:41 +08:00
曹佳豪
9d0e0eb33e 修改回调整合分发模式 2025-07-23 15:45:42 +08:00
wangqx
2e4047005f [fix]登录用户返回userSig 2025-07-15 15:23:29 +08:00
wangqx
b09b6f7ece [fix]优化pom和登录 2025-07-07 10:46:35 +08:00
fxh
19581d153a 版本管理、优化订单模块 2025-07-04 14:53:25 +08:00
wangqx
96b611f014 [fix]优化pom和登录 2025-07-04 11:12:33 +08:00
曹佳豪
5eec4e9255 发送消息迁移到im 2025-07-03 15:01:48 +08:00
wangqx
9b33dbde98 [fix]开发分账接口 2025-06-30 15:59:26 +08:00
曹佳豪
7e027b493d 消息推送加自动触发 2025-06-30 11:11:53 +08:00
fxh
029c4c1f2a 修改首页、商品 2025-06-30 10:12:40 +08:00
fxh
0c53738935 Merge remote-tracking branch 'origin/wzj-main' into wzj-main
# Conflicts:
#	ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java
2025-06-30 10:11:30 +08:00
fxh
74bdae2928 修改首页、商品 2025-06-30 10:10:18 +08:00
wangqx
06e1f6d7ed [fix]修改合并后冲突 2025-06-30 10:05:13 +08:00
wangqx
9a39b48734 Merge branch 'wzj-wqx' into wzj-main 2025-06-30 10:02:26 +08:00
wangqx
b14a8ecfae Merge remote-tracking branch 'origin/wzj-main' into wzj-main
# Conflicts:
#	ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java
2025-06-30 10:02:07 +08:00
wangqx
a46369f8c8 [fix]修改分账,增加主子表查询与保存 2025-06-30 10:00:31 +08:00
05fa2956e5 首页、商品修改 2025-06-26 17:48:00 +08:00
wangqx
5c14799691 [fix]分账规则与分账明细 2025-06-26 17:06:06 +08:00