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 |
|
wangqx
|
8f1ccba127
|
[fix]修改分账，增加主子表查询与保存
|
2025-06-27 15:44:27 +08:00 |
|
wangqx
|
1d578cbf8e
|
[fix]修改分账，增加主子表查询与保存
|
2025-06-27 15:43:48 +08:00 |
|
|
|
0210b25c70
|
修改bo对象
|
2025-06-27 14:17:58 +08:00 |
|
|
|
05fa2956e5
|
首页、商品修改
|
2025-06-26 17:48:00 +08:00 |
|
wangqx
|
ee14312dcd
|
[fix]分账规则与分账明细
|
2025-06-26 17:09:01 +08:00 |
|
wangqx
|
5c14799691
|
[fix]分账规则与分账明细
|
2025-06-26 17:06:06 +08:00 |
|
|
|
53fcafde65
|
修改商品
|
2025-06-26 10:28:35 +08:00 |
|
曹佳豪
|
9e2fa2ed16
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-24 16:29:33 +08:00 |
|
曹佳豪
|
297b0332da
|
修改消息通过腾讯im发送bug加模糊查询
|
2025-06-24 16:28:56 +08:00 |
|
|
|
e01d3c4f74
|
修改核销、订单售后
|
2025-06-24 09:52:05 +08:00 |
|
|
|
09e66734ce
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
# Conflicts:
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Withdraw.java
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/WithdrawMapper.java
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IWithdrawService.java
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/WithdrawServiceImpl.java
# ruoyi-modules/ruoyi-system/pom.xml
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java
|
2025-06-24 09:41:52 +08:00 |
|
|
|
93c6b3567b
|
修改核销、订单售后
|
2025-06-24 09:41:03 +08:00 |
|
曹佳豪
|
3a66394bbe
|
修改消息通过腾讯im发送
|
2025-06-23 15:12:35 +08:00 |
|
|
|
e2ef255d8f
|
[fix]充值与提现
|
2025-06-23 10:42:02 +08:00 |
|
|
|
ca99f31ebd
|
[fix]充值与提现
|
2025-06-21 15:01:11 +08:00 |
|
|
|
5d5702e202
|
[fix]充值与提现
|
2025-06-21 14:40:48 +08:00 |
|
曹佳豪
|
24544a18a8
|
修改消息通过WebSocket发送
|
2025-06-20 20:13:57 +08:00 |
|
曹佳豪
|
52b3be7310
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-20 20:13:34 +08:00 |
|
曹佳豪
|
bcc01a2522
|
修改消息通过WebSocket发送
|
2025-06-20 20:13:15 +08:00 |
|
|
|
ce4bd54049
|
[fix]去掉租户检查
|
2025-06-20 15:41:30 +08:00 |
|
|
|
f7a7610a7c
|
[fix]增加店铺封禁、会员封禁、会员银行卡
|
2025-06-20 15:05:24 +08:00 |
|
|
|
e3ae60b5f8
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-20 10:14:53 +08:00 |
|
|
|
04b5460cb4
|
修改订单、商品模块
|
2025-06-20 10:14:30 +08:00 |
|
曹佳豪
|
c014f65f13
|
修改消息bug
|
2025-06-20 09:31:12 +08:00 |
|
|
|
360caa64f6
|
[fix]修改购物车和会员状态调整
|
2025-06-19 16:58:48 +08:00 |
|
|
|
d8d68c59dd
|
[fix]增加会员收获地址的接口
|
2025-06-19 16:20:13 +08:00 |
|
|
|
bfcb239df2
|
[fix]增加会员填充切面，自动根据member对象填充用户数据
|
2025-06-19 15:37:02 +08:00 |
|
曹佳豪
|
409a8446c0
|
消息接口
|
2025-06-19 09:32:10 +08:00 |
|
曹佳豪
|
be202b164b
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-19 09:30:54 +08:00 |
|
曹佳豪
|
e815bc6e05
|
消息接口
|
2025-06-19 09:30:09 +08:00 |
|
|
|
049e4874a6
|
[fix]粉丝与关注等使用不同的接口
|
2025-06-17 11:02:20 +08:00 |
|
|
|
9683642563
|
修改订单、商品模块
|
2025-06-17 09:27:04 +08:00 |
|
|
|
12e888152d
|
[fix]修改粉丝与关注
|
2025-06-16 17:36:53 +08:00 |
|
|
|
3757b5562a
|
[fix]修改粉丝与关注
|
2025-06-16 17:05:24 +08:00 |
|
|
|
64cabd4de5
|
修改商品字段备注
|
2025-06-16 10:06:47 +08:00 |
|
|
|
00052cc93e
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-16 10:06:24 +08:00 |
|
|
|
2f54aee220
|
修改订单字段备注
|
2025-06-16 10:00:17 +08:00 |
|
曹佳豪
|
3b9712b361
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
|
2025-06-16 09:44:24 +08:00 |
|
曹佳豪
|
f9d822bb11
|
修改删除状态
|
2025-06-16 09:44:09 +08:00 |
|
|
|
f5fd633f8b
|
[fix]修改会员的controller
|
2025-06-16 09:43:50 +08:00 |
|
|
|
c0484c2c71
|
修改订单字段备注
|
2025-06-14 17:21:20 +08:00 |
|
|
|
05d3c17acd
|
修改订单和商品
|
2025-06-14 16:58:01 +08:00 |
|
曹佳豪
|
eacad6e370
|
修改启动报错
|
2025-06-14 15:01:14 +08:00 |
|
曹佳豪
|
e78c6d2b0d
|
Merge remote-tracking branch 'origin/wzj-main' into wzj-main
# Conflicts:
# ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IFansService.java
# ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/FansServiceImpl.java
|
2025-06-14 14:19:37 +08:00 |
|
曹佳豪
|
3c3f3d03ea
|
视频评论
|
2025-06-14 14:17:34 +08:00 |
|
|
|
b075011ce8
|
[fix]修改粉丝和关注
|
2025-06-14 11:44:05 +08:00 |
|
