Commit Graph

27 Commits

Author SHA1 Message Date
wuchunlei
6651f6cf39 新增多平台token 2024-05-29 16:04:00 +08:00
wangjinlei
af4c961793 bug 2024-05-28 15:49:49 +08:00
wangjinlei
4be1541818 命名错误,课程营销标签分开的bug 2024-05-20 16:02:52 +08:00
wangjinlei
1b3803074d bug 2024-05-16 11:48:36 +08:00
wangjinlei
d26edc9c3a bug 2024-05-15 17:57:48 +08:00
wangjinlei
c2697e5390 小bug 修复后台左侧栏目显示顺序问题 2024-04-12 17:27: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
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
c3ca9f32f9 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-03-14 09:26:18 +08:00
wangjinlei
0c740d33a0 1 2024-03-13 18:07:33 +08:00
wuchunlei
fb1426398f 多项目登录token设置 2024-03-08 14:13:12 +08:00
wuchunlei
6526b4f3d3 多项目登录token统一 2024-03-08 10:12:48 +08:00
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
ec10376492 游客访问接口类 2024-01-03 16:43:35 +08:00
wuchunlei
6b59e8539f 评论设置敏感词拦截 2023-12-04 17:55:16 +08:00
wangjinlei
2e968fc160 log-slf4j 2023-11-22 11:07:35 +08:00
wuchunlei
6ca47a843f format the code and remove the unused import 2023-10-07 13:42:25 +08:00
wangjinlei
ae15750e6a Fixing .gitignore 2023-09-19 18:24:19 +08:00
yc13649764453
4deeb605f8 --新增书评接口,端口修改 2023-09-12 18:10:26 +08:00
yc13649764453
0b193caa03 -- 新版提交 2023-09-09 13:51:35 +08:00
yc13649764453
068192327c --微信支付 2023-05-24 18:13:36 +08:00
cys841515238
efb3840f9d 支付 2023-03-02 17:01:11 +08:00
cys841515238
2733a60b97 first commit 2023-03-02 16:13:28 +08:00