Commit Graph

119 Commits

Author SHA1 Message Date
wangjinlei
b40858c767 太湖之光文章详情 2024-06-07 15:06:18 +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
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
3c23cc6bae Merge remote-tracking branch 'origin/zcc' 2024-06-03 10:16:31 +08:00
wuchunlei
8abb033014 用户订单列表
用户订单各状态下数量
2024-05-31 17:59:42 +08:00
wangjinlei
f5692949bc bug 2024-05-31 16:47:27 +08:00
wuchunlei
e60b630fd9 列表结果添加初级基础等 2024-05-31 11:14:11 +08:00
wangjinlei
a4b26fbade bug 2024-05-30 16:05:11 +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
34366ea53e bug 2024-05-30 11:36:23 +08:00
wangjinlei
0ec6c4c22b bug 2024-05-30 10:58:48 +08:00
wangjinlei
934a284263 bug 2024-05-29 11:08:47 +08:00
wangjinlei
1b47c563dd Merge remote-tracking branch 'origin/zcc' 2024-05-28 17:47:33 +08:00
wuchunlei
0181e61c14 courseMedicine 添加图片
courseToMedicine 添加初级、选修
2024-05-28 15:55:32 +08:00
wangjinlei
af4c961793 bug 2024-05-28 15:49:49 +08:00
wuchunlei
f1ffea88b4 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-27 14:52:55 +08:00
wuchunlei
05c2ac661d 数据合并
湖分兑换剩余
2024-05-27 14:52:34 +08:00
wangjinlei
9ba7f281cf bug 2024-05-27 14:22:17 +08:00
wangjinlei
ccd8e25f95 Merge remote-tracking branch 'origin/zcc' 2024-05-24 16:37:07 +08:00
wangjinlei
39063ecfd8 bug 2024-05-24 16:29:52 +08:00
wuchunlei
bccc6be3a4 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-24 16:03:44 +08:00
wangjinlei
b45f74831f bug 2024-05-24 16:03:30 +08:00
wuchunlei
97ae76984b Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-24 15:50:32 +08:00
wangjinlei
6e3cc44319 bug 2024-05-24 15:12:08 +08:00
wuchunlei
10a86a6f79 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-24 09:33:34 +08:00
wangjinlei
b48cc27723 bug 2024-05-23 14:41:38 +08:00
wangjinlei
01570f2985 bug 2024-05-22 14:33:07 +08:00
wangjinlei
58d6741d45 bug 2024-05-21 16:58:17 +08:00
wangjinlei
ec6a16eb9c bug 2024-05-21 11:03:57 +08:00
wuchunlei
cda8e4c422 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-05-20 17:14:57 +08:00
wangjinlei
4be1541818 命名错误,课程营销标签分开的bug 2024-05-20 16:02:52 +08:00
wuchunlei
d39965b032 数据合并-湖分
管理端-湖分管理
通用模块-湖分
2024-05-17 17:59:38 +08:00
wuchunlei
17700e5b84 课程医学标签 2024-05-16 15:34:05 +08:00