Commit Graph

150 Commits

Author SHA1 Message Date
wuchunlei
9c189eddf7 修改快递发货地址 2025-03-07 10:02:13 +08:00
wuchunlei
3cfcfee825 配置心灵空间wxid 2025-03-05 09:16:58 +08:00
wuchunlei
26d08a5f8b 心灵空间 2025-02-07 17:10:49 +08:00
wuchunlei
be2aee3a47 添加token更新时间 2025-01-07 09:28:58 +08:00
wuchunlei
b377c6e6ee 加入文字转语音免费版 2024-12-11 15:32:04 +08:00
wuchunlei
e591d8a31d 修改事务 2024-12-04 17:32:04 +08:00
wuchunlei
de2e71062b 修改删除 2024-12-04 15:32:26 +08:00
wuchunlei
168dd86a6f Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-11-26 15:14:44 +08:00
wuchunlei
a0c42ecea0 海外读书 2024-11-26 15:13:38 +08:00
wangjinlei
31a02d6f79 main ad 2024-11-21 17:14:07 +08:00
wuchunlei
d8acf99237 删除优惠卷
新版优惠卷
2024-09-25 16:00:51 +08:00
wangjinlei
b71537af77 config update 2024-08-30 14:53:25 +08:00
wuchunlei
40f192a8bc 小班相关 2024-08-28 10:11:41 +08:00
wangjinlei
52d5787f16 config update 2024-08-13 14:54:34 +08:00
wangjinlei
d78551efc3 vod普通加密 2024-07-29 09:19:30 +08:00
wangjinlei
14a77868cd vod普通加密 2024-07-22 09:14:28 +08:00
wangjinlei
4e206884a6 vod普通加密 2024-07-19 13:53:35 +08:00
wangjinlei
258f6a07e7 upfile config 2024-07-10 14:59:56 +08:00
wangjinlei
ec17636fe6 apkconfig 2024-07-09 15:06:03 +08:00
wangjinlei
96e457939c yml update 2024-07-01 14:38:26 +08:00
wangjinlei
2a115db799 微信支付 2024-06-19 15:27:16 +08:00
wangjinlei
580270f1f0 vip购买相关 2024-06-05 16:50:05 +08:00
wuchunlei
6651f6cf39 新增多平台token 2024-05-29 16:04:00 +08:00
wangjinlei
9ba7f281cf bug 2024-05-27 14:22:17 +08:00
wangjinlei
4be1541818 命名错误,课程营销标签分开的bug 2024-05-20 16:02:52 +08:00
wangjinlei
307eb88c50 bug 2024-05-11 13:16:36 +08:00
wuchunlei
8282c37f53 不同app用不同的appid支付 2024-05-11 13:09:27 +08:00
wangjinlei
452a246875 bug 2024-05-09 18:08:37 +08:00
wangjinlei
14c70bb6c5 bug 2024-05-09 17:42:31 +08:00
wangjinlei
e9064b617d 1 2024-04-11 11:14:52 +08:00
wuchunlei
1cfa376ade 通用模块-快递 2024-03-26 11:25:00 +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
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
d099c05e90 1 2024-03-15 14:25:19 +08:00
wangjinlei
3cef570c97 1 2024-03-15 10:19:03 +08:00
wuchunlei
5385745056 添加文件上传进度条 2024-03-13 17:18:15 +08:00
wangjinlei
f7659aa7bf bug 2023-12-29 11:54:49 +08:00
wangjinlei
ef1f48cf9a prescript 2023-12-20 09:47:28 +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
065cce514f prescript 2023-12-15 11:23:58 +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
3c9b701553 alipay回调,日志配置文件 2023-12-11 14:37:26 +08:00
wuchunlei
a88a12fd76 修改订单列表总数 2023-12-08 16:19:25 +08:00
wuchunlei
0d52f6f6c0 修改id 2023-12-07 17:03:13 +08:00
wuchunlei
d93391fbf9 订单列表增加按照商品名称查询 2023-12-07 16:22:01 +08:00
wangjinlei
5bfd35b07b bug 2023-12-06 15:44:35 +08:00
wangjinlei
26aab125d5 bug 2023-12-06 15:01:26 +08:00
wangjinlei
7b7782de17 Merge remote-tracking branch 'origin/zcc' 2023-11-27 15:37:51 +08:00