Commit Graph

691 Commits

Author SHA1 Message Date
wangjinlei
976f7885ec Merge remote-tracking branch 'origin/zcc' 2024-06-11 14:26:25 +08:00
wangjinlei
ff452b1f16 bug 2024-06-11 14:24:20 +08:00
wuchunlei
d22951c76d 医学-我的课程 2024-06-11 13:26:49 +08:00
wangjinlei
133a52c765 Merge remote-tracking branch 'origin/zcc' 2024-06-07 15:07:16 +08:00
wangjinlei
b40858c767 太湖之光文章详情 2024-06-07 15:06:18 +08:00
wuchunlei
454a6e11c7 定时任务超v过期
课程过期
2024-06-07 13:55:38 +08:00
wangjinlei
2639884eef vip购买相关 2024-06-06 11:05:41 +08:00
wuchunlei
d2644135e7 新增mediaType0空1视频2音频
组装充值配置详情
2024-06-05 17:32:57 +08:00
wangjinlei
165a108ee2 Merge remote-tracking branch 'origin/zcc' 2024-06-05 16:50:44 +08:00
wangjinlei
580270f1f0 vip购买相关 2024-06-05 16:50:05 +08:00
wuchunlei
72d6d1e888 充值、会员配置管理 2024-06-05 16:40:33 +08:00
wangjinlei
e2f382a69f vip购买相关 2024-06-05 16:17:21 +08:00
wuchunlei
dda6f4a70b 订单添加删除商品 2024-06-05 15:25:08 +08:00
wangjinlei
edb3123531 vip购买相关 2024-06-05 14:52:18 +08:00
wangjinlei
dd93a8e81f vip购买相关 2024-06-05 13:48:16 +08:00
wangjinlei
71f44ffcc0 Merge remote-tracking branch 'origin/zcc' 2024-06-04 18:03:51 +08:00
wangjinlei
861d31eb3c 获取vip商品列表 2024-06-04 17:57:36 +08:00
wuchunlei
a842bbb6d6 修改订单详情 2024-06-04 15:55:47 +08:00
wuchunlei
af2c039b82 获取医学分类标签详情 2024-06-04 15:05:14 +08:00
wuchunlei
491bcf3320 通用订单列表加分页 2024-06-04 13:34:27 +08:00
wuchunlei
a675f9be65 标签介绍和媒体 2024-06-04 10:21:49 +08:00
wuchunlei
8bec166fa6 订单详情新增
物流进度新增
用户合并修改
2024-06-03 17:03:23 +08:00
wangjinlei
6ed799cd3e 订单信息bug 2024-06-03 15:22:43 +08:00
wangjinlei
b326a2c8c3 Merge remote-tracking branch 'origin/zcc' 2024-06-03 13:48:17 +08:00
wuchunlei
18f38eefb3 获取医学课程分类标签下课程列表新增排序条件 2024-06-03 13:46:44 +08:00
wangjinlei
3c23cc6bae Merge remote-tracking branch 'origin/zcc' 2024-06-03 10:16:31 +08:00
wangjinlei
7cf93e2ff1 vip的相关 2024-06-03 10:15:18 +08:00
wuchunlei
59f8a13923 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-06-03 09:29:30 +08:00
wuchunlei
8abb033014 用户订单列表
用户订单各状态下数量
2024-05-31 17:59:42 +08:00
wangjinlei
f5692949bc bug 2024-05-31 16:47:27 +08:00
wangjinlei
20b0491879 bug 2024-05-31 15:50:07 +08:00
wangjinlei
02f4c63062 bug 2024-05-31 13:37:11 +08:00
wuchunlei
de0e629742 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-31 11:14:24 +08:00
wuchunlei
e60b630fd9 列表结果添加初级基础等 2024-05-31 11:14:11 +08:00
wangjinlei
3085b79976 Merge remote-tracking branch 'origin/zcc' 2024-05-31 10:19:48 +08:00
wangjinlei
ad2c24564a bug 2024-05-31 10:18:14 +08:00
wuchunlei
7cabd0e921 用户开课 2024-05-31 09:40:36 +08:00
wangjinlei
a4b26fbade bug 2024-05-30 16:05:11 +08:00
wangjinlei
8e758aa3e8 bug 2024-05-30 15:06:57 +08:00
wangjinlei
514bc9e67d bug 2024-05-30 14:36:24 +08:00
wangjinlei
deefb27ee4 Merge remote-tracking branch 'origin/zcc'
# Conflicts:
#	src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java
2024-05-30 14:35:00 +08:00
wangjinlei
cda9eb9ae7 bug 2024-05-30 14:32:28 +08:00
wuchunlei
ed90ee561c 吴门医述首页获取课程价格、说明 2024-05-30 14:31:58 +08:00
wangjinlei
f8d98dda1b bug 2024-05-30 13:51:20 +08:00
wangjinlei
6ab30dd9bd bug 2024-05-30 13:15:22 +08:00
wangjinlei
cf3e3e9dca Merge remote-tracking branch 'origin/zcc' 2024-05-30 11:37:42 +08:00
wangjinlei
34366ea53e bug 2024-05-30 11:36:23 +08:00
wuchunlei
d11059654d 吴门医述首页获取课程分类标签单节点的子分类标签树 2024-05-30 11:21:24 +08:00
wuchunlei
f02414fdcb Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-30 11:19:44 +08:00
wangjinlei
0ec6c4c22b bug 2024-05-30 10:58:48 +08:00