wangjinlei
|
051373adf0
|
支付回调不加书bug
|
2023-11-02 18:19:13 +08:00 |
|
wangjinlei
|
f219296d33
|
血脉初建
|
2023-11-02 16:28:13 +08:00 |
|
wangjinlei
|
2996a1bbc7
|
血脉初建
|
2023-11-02 13:24:19 +08:00 |
|
wangjinlei
|
eff309f8cb
|
更新
|
2023-11-01 16:50:56 +08:00 |
|
wangjinlei
|
f037f9c2f5
|
发货相关更新
|
2023-10-31 11:53:01 +08:00 |
|
wangjinlei
|
fd998c4db8
|
配置文件修正
|
2023-10-27 17:22:48 +08:00 |
|
wangjinlei
|
950cb30cd5
|
字段错误修正
|
2023-10-27 17:22:16 +08:00 |
|
wangjinlei
|
c0b5bd14fd
|
Merge branch 'develop/express'
# Conflicts:
# src/main/resources/application-dev.yml
|
2023-10-27 13:14:51 +08:00 |
|
wangjinlei
|
0a21f56c8b
|
用户订单列表
|
2023-10-27 11:34:18 +08:00 |
|
wangjinlei
|
78ef8bc4ac
|
用户订单列表
|
2023-10-26 19:37:23 +08:00 |
|
wangjinlei
|
c5e6cfdc89
|
修复
|
2023-10-26 17:52:54 +08:00 |
|
wangjinlei
|
71a72c5579
|
找回controller，修复state bug
|
2023-10-26 14:17:04 +08:00 |
|
Cauchy
|
0ae9d88639
|
Merge branch 'master' into develop/express
|
2023-10-25 09:05:37 +08:00 |
|
Cauchy
|
b57b196dd5
|
bug fix
|
2023-10-24 13:08:01 +08:00 |
|
Cauchy
|
7c9540f3ae
|
bug fix
|
2023-10-24 10:17:40 +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 |
|
wangjinlei
|
8263215d1f
|
Merge remote-tracking branch 'origin/dev1/user_model'
|
2023-10-20 15:15:48 +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 |
|
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 |
|
Cauchy
|
19a2ef58a9
|
merge master
|
2023-10-18 17:16:45 +08:00 |
|
Cauchy
|
c90ecfb7ce
|
bug fix 1018
|
2023-10-18 16:37:58 +08:00 |
|
Cauchy
|
5dee4b619e
|
bug fix
|
2023-10-18 13:02:54 +08:00 |
|
wangjinlei
|
59f46eb2aa
|
point bug
|
2023-10-18 10:12:30 +08:00 |
|
Cauchy
|
8daf30493c
|
flow
|
2023-10-17 16:27:26 +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
|
08cc5c3a3d
|
refactor code
|
2023-10-16 14:55:34 +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 |
|
Cauchy
|
6bf8fd586c
|
temp
|
2023-10-12 13:33:54 +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
|
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 |
|
Cauchy
|
6e18e90467
|
bug fix
|
2023-10-10 17:27:57 +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 |
|
Cauchy
|
e75fc8e32d
|
修改微信支付
|
2023-10-09 15:37:55 +08:00 |
|
Cauchy
|
0453bead38
|
optimize the code
|
2023-10-09 13:27:13 +08:00 |
|
Cauchy
|
7c25318835
|
format code
|
2023-10-08 18:03:11 +08:00 |
|