Commit Graph

145 Commits

Author SHA1 Message Date
wangjinlei
c4988de124 找回controller,修复state bug 2023-10-26 10:51:12 +08:00
wangjinlei
0658e0a325 书评单本书显示其他书评的bug 2023-10-23 15:26:10 +08:00
wangjinlei
03d751d804 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java 2023-10-23 15:03:36 +08:00
Cauchy
0772e198c9 Merge branch 'master' into develop/express 2023-10-23 15:01:25 +08:00
Cauchy
d9fd3d5a5b bug fix 2023-10-23 15:01:07 +08:00
Cauchy
bd9083392d bug fix 2023-10-23 14:21:16 +08:00
Cauchy
e400fa6eba chat sub list 2023-10-23 13:26:43 +08:00
Cauchy
40529097eb production test 2023-10-23 10:07:21 +08:00
Cauchy
739adb011d bugfix: 补卡,评论区分页 2023-10-22 18:00:14 +08:00
Cauchy
f9b852d637 add value 2023-10-20 17:54:17 +08:00
wangjinlei
0372bc2dfd Merge remote-tracking branch 'origin/develop/express' 2023-10-20 17:10:46 +08:00
Cauchy
0633287662 bug fix 2023-10-20 16:31:04 +08:00
wangjinlei
8263215d1f Merge remote-tracking branch 'origin/dev1/user_model' 2023-10-20 15:15:48 +08:00
Cauchy
e4bd2854a3 recover 2023-10-20 14:56:09 +08:00
Cauchy
e25d66878e modify address 2023-10-20 14:47:19 +08:00
Cauchy
62ea0482a3 order list order detail print template template list 2023-10-20 14:14:20 +08:00
wangjinlei
d950c07e95 config and user bug 2023-10-20 13:52:10 +08:00
Cauchy
a1b70c8d4f order list finish 2023-10-20 10:47:33 +08:00
Cauchy
21ca9f8d7d finish order list 2023-10-20 08:55:06 +08:00
Cauchy
7005fd8b4d bug fix 2023-10-19 17:54:38 +08:00
wangjinlei
07efdd2a14 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into dev1/user_model 2023-10-19 17:35:54 +08:00
wangjinlei
ca3846e1a7 config and user bug 2023-10-19 17:33:21 +08:00
Cauchy
a4492f26e7 order list 2023-10-19 17:22:35 +08:00
Cauchy
a59e04e406 Merge branch 'master' into develop/express 2023-10-19 15:05:53 +08:00
Cauchy
1994ba60ae refactor project 2023-10-19 15:04:31 +08:00
wangjinlei
c6907893ed config and user bug 2023-10-18 18:12:17 +08:00
wangjinlei
16ef555d46 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java 2023-10-18 17:19:09 +08:00
Cauchy
19a2ef58a9 merge master 2023-10-18 17:16:45 +08:00
Cauchy
f1b072d6c3 bug fix 2023-10-18 16:59:07 +08:00
Cauchy
c90ecfb7ce bug fix 1018 2023-10-18 16:37:58 +08:00
wangjinlei
37688a42c5 userlist bug 2023-10-18 15:01:31 +08:00
Cauchy
5dee4b619e bug fix 2023-10-18 13:02:54 +08:00
wangjinlei
8f7f785ba9 userentity bug 2023-10-18 12:41:22 +08:00
wangjinlei
59f46eb2aa point bug 2023-10-18 10:12:30 +08:00
wangjinlei
ff1e833d5f bug xf 2023-10-17 17:30:35 +08:00
Cauchy
113243e918 express order finished 2023-10-17 17:22:08 +08:00
Cauchy
bdc561895e handle exception 2023-10-17 16:53:34 +08:00
Cauchy
8daf30493c flow 2023-10-17 16:27:26 +08:00
wangjinlei
26c4b00e8c bug xf 2023-10-17 15:49:34 +08:00
wangjinlei
bb9be1748b bug xf 2023-10-17 15:45:28 +08:00
Cauchy
99484c90e0 flow finished need to test 2023-10-17 13:23:21 +08:00
Cauchy
c268fb185d business 2023-10-17 10:40:48 +08:00
Cauchy
22fb5ec3a8 express refactor 2023-10-16 17:51:37 +08:00
Cauchy
e80116643c remove unused code 2023-10-16 15:16:30 +08:00
Cauchy
08cc5c3a3d refactor code 2023-10-16 14:55:34 +08:00
wangjinlei
93eddae8f0 forum bug 2023-10-13 17:30:00 +08:00
wangjinlei
0d29114953 isnew 2023-10-12 17:59:43 +08:00
wangjinlei
4b41546072 Merge remote-tracking branch 'origin/develop/clock_in'
# Conflicts:
#	src/main/java/com/peanut/config/MyRedissonConfig.java
2023-10-12 16:40:41 +08:00
Cauchy
5c2cc8529b bug fix 2023-10-12 16:38:30 +08:00
wangjinlei
c8a494c46c Merge remote-tracking branch 'origin/dev1/newpage' 2023-10-12 14:53:14 +08:00