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
|
5d0633d1bb
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java
# Conflicts:
# src/main/java/com/peanut/config/MyRedissonConfig.java
|
2023-10-12 18:00:55 +08:00 |
|
wangjinlei
|
0d29114953
|
isnew
|
2023-10-12 17:59:43 +08:00 |
|
Cauchy
|
481446c38d
|
merge clock in
|
2023-10-12 17:45:21 +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 |
|
wangjinlei
|
b671871a28
|
teachin
|
2023-10-12 14:52:11 +08:00 |
|
Cauchy
|
9978724a5d
|
Merge branch 'temp' into develop/clock_in
|
2023-10-12 13:34:16 +08:00 |
|
Cauchy
|
6bf8fd586c
|
temp
|
2023-10-12 13:33:54 +08:00 |
|
wangjinlei
|
cb4a063045
|
Merge remote-tracking branch 'origin/dev1/newpage'
|
2023-10-12 10:12:00 +08:00 |
|
wangjinlei
|
75560923b0
|
env
|
2023-10-12 09:59:29 +08:00 |
|
Cauchy
|
279eca6788
|
rename field
|
2023-10-11 17:57:51 +08:00 |
|
wangjinlei
|
9504daa032
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into wjl
|
2023-10-11 17:33:53 +08:00 |
|
wangjinlei
|
f8b01d9aee
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-11 17:28:18 +08:00 |
|
Cauchy
|
a356cceb62
|
rename the file
|
2023-10-11 16:51:29 +08:00 |
|
Cauchy
|
d80d598529
|
clock in and comment finished waitting for test
|
2023-10-11 14:22:45 +08:00 |
|
wangjinlei
|
636416a2ba
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into wjl
|
2023-10-10 18:17:52 +08:00 |
|
wangjinlei
|
19e105b95e
|
Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-10 18:12:51 +08:00 |
|
Cauchy
|
6a66bc7249
|
modify file
|
2023-10-10 18:10:40 +08:00 |
|
wangjinlei
|
62021a922d
|
Merge remote-tracking branch 'origin/bugfix/pay_status_bug'
|
2023-10-10 17:33:50 +08:00 |
|
Cauchy
|
c21c82d5d3
|
expire time
|
2023-10-10 17:32:13 +08:00 |
|
Cauchy
|
6e18e90467
|
bug fix
|
2023-10-10 17:27:57 +08:00 |
|
wangjinlei
|
6ab2a0bf82
|
Merge remote-tracking branch 'origin/bugfix/pay_status_bug'
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-10 17:24:10 +08:00 |
|
wangjinlei
|
d23ec8b533
|
dto
|
2023-10-10 16:45:46 +08:00 |
|
Cauchy
|
f3df8b326b
|
handle out of time
|
2023-10-10 16:24:03 +08:00 |
|
wangjinlei
|
e682d9934e
|
clock打卡前端
|
2023-10-10 15:21:12 +08:00 |
|
wangjinlei
|
9d700af56e
|
clock打卡
|
2023-10-10 14:04:34 +08:00 |
|