Commit Graph

385 Commits

Author SHA1 Message Date
wuchunlei
2808e2d3c2 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-01-05 15:03:02 +08:00
wangjinlei
573ae138c5 隐私协议 2024-01-05 14:21:02 +08:00
wangjinlei
39ac9cf4dd 隐私协议 2024-01-05 13:28:24 +08:00
wuchunlei
34882f7d41 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-01-05 10:05:51 +08:00
wuchunlei
ab74b8fa21 传承列表返回添加类型 2024-01-05 09:47:57 +08:00
wangjinlei
a2f023451f 关联书 2024-01-04 13:41:00 +08:00
wangjinlei
812ee419ba 关联书 2024-01-04 10:32:34 +08:00
wuchunlei
e631a38674 游客接口 2024-01-03 16:58:16 +08:00
wuchunlei
ec10376492 游客访问接口类 2024-01-03 16:43:35 +08:00
wuchunlei
3c70438366 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-01-03 16:26:00 +08:00
wuchunlei
8254514f8c 证书工具 2024-01-03 16:25:47 +08:00
wuchunlei
40f2f46da0 商品列表排序从时间换为sort 2024-01-02 16:55:06 +08:00
wangjinlei
62bc356219 Merge remote-tracking branch 'origin/zcc' 2024-01-02 16:45:00 +08:00
wuchunlei
eccc736079 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-01-02 16:07:46 +08:00
wuchunlei
67c645fcd3 吴门医述 2024-01-02 16:07:17 +08:00
wuchunlei
892e29571b Merge remote-tracking branch 'origin/zcc' into zcc
# Conflicts:
#	src/main/java/com/peanut/modules/book/controller/MyUserController.java
2024-01-02 13:36:36 +08:00
wangjinlei
2cf70e4f6a bug 2023-12-29 17:52:48 +08:00
wangjinlei
43ce513550 bug 2023-12-29 15:59:41 +08:00
wangjinlei
889adeb00c bug 2023-12-29 15:43:28 +08:00
wangjinlei
f7659aa7bf bug 2023-12-29 11:54:49 +08:00
wangjinlei
aea90d41a0 Merge remote-tracking branch 'origin/zcc' 2023-12-29 11:19:14 +08:00
wuchunlei
acf3f7522a Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2023-12-29 10:28:28 +08:00
wuchunlei
078c001198 查询商品列表是增加库存大于0限制 2023-12-28 17:25:07 +08:00
wangjinlei
79efe0b151 bug 2023-12-27 16:52:20 +08:00
wangjinlei
f1fb1938ef bug 2023-12-27 16:51:12 +08:00
wuchunlei
cdb6cb79be 修改邮件端口 2023-12-26 14:51:21 +08:00
wuchunlei
e85ad408a6 设置密码添加邮箱 2023-12-26 11:18:11 +08:00
wuchunlei
6c6887c629 登录注册添加邮箱方式 2023-12-26 10:56:58 +08:00
wuchunlei
f9d95718cd 邮箱验证码 2023-12-25 15:37:24 +08:00
wuchunlei
b19d04f09d 收货信息不能有+& 2023-12-25 10:41:45 +08:00
wuchunlei
a2a3904347 微信死信队列更改订单状态 2023-12-25 09:52:20 +08:00
wuchunlei
16039baadd 推荐列表去除中医经典和医学经典 2023-12-21 16:16:18 +08:00
wuchunlei
3e3b3755f9 中医经典加国学经典 2023-12-21 15:39:32 +08:00
wuchunlei
2f6013bbcf 讲书增加视频 2023-12-21 11:36:36 +08:00
wangjinlei
1bde058be9 肿瘤古方 权限 2023-12-20 14:39:34 +08:00
wangjinlei
c93679804b Merge remote-tracking branch 'origin/zcc' 2023-12-20 09:48:22 +08:00
wangjinlei
ef1f48cf9a prescript 2023-12-20 09:47:28 +08:00
wuchunlei
fafa2ecc73 中医经典 2023-12-20 09:46:26 +08:00
wuchunlei
229ce39c5e 微信支付宝退款 2023-12-19 17:04:05 +08:00
wangjinlei
032cfc9266 Merge remote-tracking branch 'origin/zcc' 2023-12-19 16:24:15 +08:00
wangjinlei
d12949549d prescript 2023-12-19 16:23:18 +08:00
wangjinlei
42cbc1155e prescript 2023-12-15 17:46:57 +08:00
wangjinlei
8d88be960e prescript 2023-12-15 15:39:57 +08:00
wangjinlei
065cce514f prescript 2023-12-15 11:23:58 +08:00
wangjinlei
b527976180 prescript 2023-12-14 17:11:46 +08:00
wangjinlei
a3b3c1f5f6 prescript 2023-12-14 15:22:10 +08:00
wangjinlei
af081f6e81 prescript 2023-12-14 14:52:49 +08:00
wangjinlei
6a42c41ec2 prescript 2023-12-14 13:23:18 +08:00
wangjinlei
508a260a5a prescript 2023-12-14 11:47:47 +08:00
wangjinlei
3219a332e6 Merge remote-tracking branch 'origin/wjl/ban1' 2023-12-14 10:00:29 +08:00