Commit Graph

52 Commits

Author SHA1 Message Date
wangjinlei
14c70bb6c5 bug 2024-05-09 17:42:31 +08:00
wangjinlei
9ff79cede2 bug 2024-05-08 14:50:14 +08:00
wangjinlei
e7909ba934 bug 2024-05-07 18:19:17 +08:00
wangjinlei
b4988a3fd4 bug 2024-05-06 18:09:41 +08:00
wangjinlei
55b733c693 bug 2024-04-30 17:05:28 +08:00
wangjinlei
871fc79cca bug 2024-04-30 09:17:58 +08:00
wangjinlei
5c7d424f5e 时长信息转到video主体 增加多线程获取时间方法 2024-04-26 10:44:48 +08:00
wangjinlei
0764d8dce4 初始化视频首次加载的时间 2024-04-24 19:12:30 +08:00
wangjinlei
872b9939f9 加密视频验证 2024-04-24 11:09:09 +08:00
wangjinlei
ba2fa6baf3 修复一下bug 2024-04-23 16:36:04 +08:00
wangjinlei
311dd6ed70 修复一下bug 2024-04-22 15:48:09 +08:00
wuchunlei
a855db66a9 管理端-课程营销标签 2024-04-19 10:39:40 +08:00
wuchunlei
9009b18ce6 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-04-18 15:42:21 +08:00
wangjinlei
8d7a0fdaf2 课程image 2024-04-18 13:22:35 +08:00
wuchunlei
82a4f0b21b 通用模块-会员价格 2024-04-17 09:37:57 +08:00
wuchunlei
6128af80d8 通用模块-商品评价 2024-04-16 09:48:47 +08:00
wangjinlei
5d5aefd261 小bug 修复 2024-04-12 15:05:11 +08:00
wangjinlei
bf1def1c3d 小bug 修复 2024-04-12 11:24:25 +08:00
wangjinlei
e338179190 Merge remote-tracking branch 'origin/zcc' 2024-04-12 09:45:19 +08:00
wangjinlei
ce4355d2b1 1 2024-04-11 17:33:14 +08:00
wuchunlei
45d57ae5d6 商品管理-国学、医学标签管理 2024-04-11 14:02:27 +08:00
wangjinlei
e9064b617d 1 2024-04-11 11:14:52 +08:00
wuchunlei
b705aec11d 主页-我的课程 2024-04-11 09:05:34 +08:00
wuchunlei
145e062ebe Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-04-03 09:09:28 +08:00
wuchunlei
015d8a9732 超v管理 2024-04-02 10:21:57 +08:00
wangjinlei
20bcc445da 1 2024-04-02 09:32:12 +08:00
wuchunlei
ef2e2d38b1 通用模块-公共消息 2024-03-28 17:25:57 +08:00
wuchunlei
3e46ee92ba 管理端模块-消息管理 2024-03-28 17:10:09 +08:00
wuchunlei
e92dfa8b13 通用模块-商品评价 2024-03-28 10:29:29 +08:00
wuchunlei
1b1cee0e90 通用模块-商品评价 2024-03-27 17:04:16 +08:00
wangjinlei
b2b0841b6a Merge remote-tracking branch 'origin/zcc' 2024-03-27 16:39:18 +08:00
wuchunlei
203edb3ce1 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-03-26 18:01:13 +08:00
wangjinlei
d4f30ed903 1 2024-03-26 17:23:15 +08:00
wuchunlei
1cfa376ade 通用模块-快递 2024-03-26 11:25:00 +08:00
wuchunlei
24f969f4d3 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-03-25 17:46:48 +08:00
wuchunlei
21a8309563 通用文件新项目 2024-03-25 17:46:34 +08:00
wuchunlei
92a582bee0 通用模块修改 2024-03-25 11:27:37 +08:00
wangjinlei
747ea62a36 新增课程目录 2024-03-25 10:59:52 +08:00
wuchunlei
c32eaf2db5 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-03-25 10:55:01 +08:00
wuchunlei
ed1a95aac0 添加common下用户注册登录 2024-03-25 10:54:35 +08:00
wangjinlei
a5d255ea16 1 2024-03-22 17:26:05 +08:00
wangjinlei
4999d1e157 1 2024-03-22 16:11:25 +08:00
wangjinlei
44c27b9c7a 1 2024-03-22 13:42:42 +08:00
wangjinlei
c7310af8ba 1 2024-03-22 13:41:31 +08:00
wangjinlei
7575a89e4b 1 2024-03-21 17:44:57 +08:00
wangjinlei
20c9e2249b 1 2024-03-21 16:45:29 +08:00
wangjinlei
0a8db2b2cc 1 2024-03-21 16:26:13 +08:00
wangjinlei
2a00c09e0a 1 2024-03-21 10:04:15 +08:00
wangjinlei
229fd2513b 1 2024-03-21 09:45:39 +08:00
wangjinlei
eb1a5c5f9b Merge remote-tracking branch 'origin/master' into wumedical/v1
# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopStoreDao.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopStore.java
2024-03-21 09:25:48 +08:00