Commit Graph

325 Commits

Author SHA1 Message Date
wangjinlei
328f90926f jf
消费
2024-05-13 13:24:11 +08:00
wuchunlei
8282c37f53 不同app用不同的appid支付 2024-05-11 13:09:27 +08:00
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
57c2633990 bug 2024-04-28 11:20:56 +08:00
wangjinlei
dbe836f884 bug 2024-04-28 10:25:31 +08:00
wangjinlei
ba2fa6baf3 修复一下bug 2024-04-23 16:36:04 +08:00
wangjinlei
3cbd29de4b 修复一下bug 2024-04-22 16:10:17 +08:00
wangjinlei
d6123a8132 修复一下bug 2024-04-22 14:33:39 +08:00
wuchunlei
b507ff6683 绑定邮箱-添加已绑定判断 2024-04-11 16:32:37 +08:00
wuchunlei
b705aec11d 主页-我的课程 2024-04-11 09:05:34 +08:00
wuchunlei
5606c3d380 购物车-修复商品被删除,获取购物车列表出错 2024-04-08 15:00:30 +08:00
wuchunlei
322eb45392 发货添加错误时返回原因 2024-03-29 13:10:59 +08:00
wuchunlei
5104976112 修改商品标签 2024-03-28 11:03:24 +08:00
wuchunlei
e92dfa8b13 通用模块-商品评价 2024-03-28 10:29:29 +08:00
wuchunlei
1b1cee0e90 通用模块-商品评价 2024-03-27 17:04:16 +08:00
wuchunlei
21a8309563 通用文件新项目 2024-03-25 17:46:34 +08:00
wuchunlei
92a582bee0 通用模块修改 2024-03-25 11:27:37 +08:00
wuchunlei
ed1a95aac0 添加common下用户注册登录 2024-03-25 10:54:35 +08:00
wuchunlei
80a13f95ce 图书商品标签修改 2024-03-22 16:55:08 +08:00
wuchunlei
0bb2579337 图书标签修改-加判断条件 2024-03-22 14:26:14 +08:00
wuchunlei
e53b954769 修改图书标签方法 2024-03-21 18:05:22 +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
d4ea32c6d7 1 2024-02-06 16:26:55 +08:00
wangjinlei
9a6f2a0da1 1 2024-02-05 13:44:49 +08:00
wangjinlei
f2a015dc1a 书评bug 2024-02-02 18:05:11 +08:00
wangjinlei
a6c2a9fd84 书评bug 2024-02-02 11:12:18 +08:00
wuchunlei
413f63c67c 方药查询-药材列表修改 2024-01-31 14:44:25 +08:00
wangjinlei
8d3a6e11aa 后台修改用户电话或邮箱接口 2024-01-29 16:39:00 +08:00
wangjinlei
a885f2230f Merge remote-tracking branch 'origin/zcc' 2024-01-29 14:54:59 +08:00
wangjinlei
be8303fc2c 后台修改用户电话或邮箱接口 2024-01-29 14:52:59 +08:00
wuchunlei
e8a5bf08ad 吴门医述-学术传承-人员地址展示 2024-01-27 10:08:44 +08:00
wuchunlei
325dd75bfa 方药-药列表返回结果修改,增加排序点击量 2024-01-26 10:16:19 +08:00
wuchunlei
928a959998 吴门医述-专著出版-列表查询删除上下架条件 2024-01-25 13:55:32 +08:00
wuchunlei
25814e03ff 吴门医述-学术传承-人员地址展示 2024-01-25 13:11:15 +08:00
wuchunlei
506e8d6b84 吴门医述-学术传承-外国地址修改为数据字典取值 2024-01-22 17:53:01 +08:00
wuchunlei
3f46c1f562 药材表添加-功效 2024-01-22 13:44:25 +08:00
wuchunlei
89fd0725f7 吴门医述-传承人添加国外地址 2024-01-18 14:37:06 +08:00
wuchunlei
7fa201590c Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-01-18 14:11:40 +08:00