wangjinlei
|
7d8f0d85b3
|
bug
|
2024-05-09 16:01:48 +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
|
871fc79cca
|
bug
|
2024-04-30 09:17:58 +08:00 |
|
wangjinlei
|
97e9aecd68
|
买课的订单状态归转
|
2024-04-28 17:55:46 +08:00 |
|
wangjinlei
|
ba2fa6baf3
|
修复一下bug
|
2024-04-23 16:36:04 +08:00 |
|
wuchunlei
|
5606c3d380
|
购物车-修复商品被删除，获取购物车列表出错
|
2024-04-08 15:00:30 +08:00 |
|
wuchunlei
|
322eb45392
|
发货添加错误时返回原因
|
2024-03-29 13:10:59 +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 |
|
wuchunlei
|
b68d7201d6
|
图书和营销标签、小店
|
2024-03-21 09:22:27 +08:00 |
|
wangjinlei
|
c536752f14
|
1
|
2024-03-19 14:15:11 +08:00 |
|
wangjinlei
|
66b9cb6a0b
|
Merge remote-tracking branch 'origin/master' into wumedical/v1
# Conflicts:
# src/main/java/com/peanut/modules/common/dao/ChineseMedicineResearchDao.java
# src/main/java/com/peanut/modules/common/dao/GeneralArticleDao.java
# src/main/java/com/peanut/modules/common/entity/ChineseMedicineResearch.java
# src/main/java/com/peanut/modules/common/entity/GeneralArticle.java
|
2024-03-15 14:27:22 +08:00 |
|
wangjinlei
|
3cef570c97
|
1
|
2024-03-15 10:19:03 +08:00 |
|
wuchunlei
|
63fdd2759e
|
统一吴门医述里图文文章
|
2024-03-14 15:38:27 +08:00 |
|
wuchunlei
|
81ab5d5b03
|
中医研究
|
2024-02-26 16:11:02 +08:00 |
|
wuchunlei
|
bae3ad563d
|
吴门医述-吴门纪实
|
2024-02-23 11:29:54 +08:00 |
|
wangjinlei
|
8d3a6e11aa
|
后台修改用户电话或邮箱接口
|
2024-01-29 16:39:00 +08:00 |
|
wangjinlei
|
be8303fc2c
|
后台修改用户电话或邮箱接口
|
2024-01-29 14:52:59 +08:00 |
|
wangjinlei
|
5268a0646d
|
个人冲扣
|
2024-01-18 13:16:50 +08:00 |
|
wuchunlei
|
b3bef83b95
|
方剂增加药
穴位增加脉络
|
2024-01-17 15:12:28 +08:00 |
|
wuchunlei
|
f0c464ab1a
|
图书管理章节拆分
|
2024-01-15 11:42:41 +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 |
|
wangjinlei
|
812ee419ba
|
关联书
|
2024-01-04 10:32:34 +08:00 |
|
wuchunlei
|
40f2f46da0
|
商品列表排序从时间换为sort
|
2024-01-02 16:55:06 +08:00 |
|
wuchunlei
|
67c645fcd3
|
吴门医述
|
2024-01-02 16:07:17 +08:00 |
|
wuchunlei
|
078c001198
|
查询商品列表是增加库存大于0限制
|
2023-12-28 17:25:07 +08:00 |
|
wuchunlei
|
16039baadd
|
推荐列表去除中医经典和医学经典
|
2023-12-21 16:16:18 +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
|
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 |
|
wangjinlei
|
6ea7db8ebd
|
new prescript
|
2023-12-14 09:59:51 +08:00 |
|
wangjinlei
|
75fb345328
|
new prescript
|
2023-12-13 17:24:20 +08:00 |
|
wangjinlei
|
ecaaf81dcf
|
bug
|
2023-12-13 13:19:22 +08:00 |
|
wuchunlei
|
047065b828
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
|
2023-12-12 14:02:35 +08:00 |
|
wangjinlei
|
c3453e3aa5
|
bug
|
2023-12-12 11:29:01 +08:00 |
|
wangjinlei
|
0376420aca
|
添加订单地址信息
|
2023-12-12 10:58:55 +08:00 |
|
wangjinlei
|
3c9b701553
|
alipay回调，日志配置文件
|
2023-12-11 14:37:26 +08:00 |
|
wangjinlei
|
c23bb86aca
|
订单列表
|
2023-12-08 17:24:01 +08:00 |
|
wuchunlei
|
a88a12fd76
|
修改订单列表总数
|
2023-12-08 16:19:25 +08:00 |
|
wuchunlei
|
97028bb4ee
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
|
2023-12-08 15:21:56 +08:00 |
|
wangjinlei
|
bbe04ad425
|
订单列表重构
|
2023-12-08 15:21:49 +08:00 |
|
wuchunlei
|
1ff200ba2a
|
订单详情
|
2023-12-08 11:09:51 +08:00 |
|