Commit Graph

400 Commits

Author SHA1 Message Date
wuchunlei
e53b954769 修改图书标签方法 2024-03-21 18:05:22 +08:00
wangjinlei
6aa20d72b7 1 2024-03-21 18:02:26 +08:00
wangjinlei
f131faa58b 1 2024-03-21 18:00:21 +08:00
wangjinlei
4014812781 1 2024-03-21 17:46:43 +08:00
wangjinlei
7575a89e4b 1 2024-03-21 17:44:57 +08:00
wangjinlei
20c9e2249b 1 2024-03-21 16:45:29 +08:00
wangjinlei
0a8db2b2cc 1 2024-03-21 16:26:13 +08:00
wangjinlei
e92258dfe6 1 2024-03-21 10:43:40 +08:00
wangjinlei
ad4651da74 1 2024-03-21 10:27:27 +08:00
wangjinlei
2a00c09e0a 1 2024-03-21 10:04:15 +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
d099c05e90 1 2024-03-15 14:25:19 +08:00
wangjinlei
3cef570c97 1 2024-03-15 10:19:03 +08:00
wuchunlei
63fdd2759e 统一吴门医述里图文文章 2024-03-14 15:38:27 +08:00
wuchunlei
36bb3fc194 添加文件上传进度条 2024-03-14 10:58:13 +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
5385745056 添加文件上传进度条 2024-03-13 17:18:15 +08:00
wuchunlei
ce9fbaa319 添加文件上传进度 2024-03-13 15:46:21 +08:00
wuchunlei
cf2fa5daf6 添加上传文件进度条 2024-03-13 14:44:35 +08:00
wuchunlei
e6d1250cf6 添加文件上传进度条 2024-03-13 14:33:24 +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
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
wangjinlei
5268a0646d 个人冲扣 2024-01-18 13:16:50 +08:00
wuchunlei
5331ed184f 吴门医述-学术传承-人员地址添加国外 2024-01-18 13:09:32 +08:00
wangjinlei
484946b2f5 后台超找用户时email关键字 2024-01-18 09:30:23 +08:00
wuchunlei
62e33a19fc 我的图书-修复已购图书显示所有 2024-01-17 16:56:37 +08:00
wuchunlei
b3bef83b95 方剂增加药
穴位增加脉络
2024-01-17 15:12:28 +08:00