Cauchy
|
481446c38d
|
merge clock in
|
2023-10-12 17:45:21 +08:00 |
|
Cauchy
|
5c2cc8529b
|
bug fix
|
2023-10-12 16:38:30 +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 |
|
wangjinlei
|
4de14d9eed
|
clock打卡
|
2023-10-10 13:11:04 +08:00 |
|
Cauchy
|
6ab08f7a29
|
bug fix
|
2023-10-09 17:55:28 +08:00 |
|
wangjinlei
|
768dbff7fc
|
Merge remote-tracking branch 'origin/wjl'
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-09 15:49:04 +08:00 |
|
wangjinlei
|
1af79b4ec4
|
Merge branch 'bugfix/wechatcallback' of https://gitee.com/wjl2008_admin/nuttyreading-java into wjl
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-09 15:47:07 +08:00 |
|
wangjinlei
|
014cececa3
|
Merge remote-tracking branch 'origin/bugfix/wechatcallback'
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-09 15:43:08 +08:00 |
|
Cauchy
|
e75fc8e32d
|
修改微信支付
|
2023-10-09 15:37:55 +08:00 |
|
wangjinlei
|
da53604287
|
多默认地址bug
|
2023-10-09 14:09:45 +08:00 |
|
wangjinlei
|
4cc015f0a9
|
修改配置文件
|
2023-10-09 14:03:04 +08:00 |
|
wangjinlei
|
620a8ef2ac
|
Merge remote-tracking branch 'origin/bugfix/wechatcallback'
# Conflicts:
# src/main/resources/weChatConfig.properties
|
2023-10-09 13:55:08 +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 |
|
wangjinlei
|
670229c06f
|
修改配置文件
|
2023-10-08 15:47:58 +08:00 |
|
Cauchy
|
336b3d8090
|
merge and modify config file
|
2023-10-08 15:18:38 +08:00 |
|
Cauchy
|
059f5f8fe8
|
pay notify
|
2023-10-08 14:56:26 +08:00 |
|
wangjinlei
|
a17d2fc840
|
20231007
|
2023-10-07 18:10:50 +08:00 |
|
wuchunlei
|
b18fc6cff9
|
remove unused import
|
2023-10-07 17:22:58 +08:00 |
|
wangjinlei
|
5de88ed184
|
20231007
|
2023-10-07 15:31:51 +08:00 |
|
wangjinlei
|
ca919c55cd
|
20231007
|
2023-10-07 14:36:14 +08:00 |
|
wuchunlei
|
6ca47a843f
|
format the code and remove the unused import
|
2023-10-07 13:42:25 +08:00 |
|
wangjinlei
|
880c412b19
|
新版
|
2023-10-07 10:56:27 +08:00 |
|
wangjinlei
|
fb7016d471
|
新版
|
2023-09-28 16:28:34 +08:00 |
|
wangjinlei
|
4849defaef
|
新版
|
2023-09-27 17:13:11 +08:00 |
|
wangjinlei
|
c3ba1d9691
|
新版
|
2023-09-27 15:57:35 +08:00 |
|
wangjinlei
|
1755a78a8d
|
新版
|
2023-09-26 16:55:44 +08:00 |
|
wangjinlei
|
e42d0243cd
|
新版
|
2023-09-26 14:12:23 +08:00 |
|
yc13649764453
|
ede49d670c
|
--新增 修改
|
2023-09-25 18:02:33 +08:00 |
|
wangjinlei
|
03816ced8a
|
新版
|
2023-09-25 17:52:33 +08:00 |
|
wangjinlei
|
bba5a6f4e0
|
新版
|
2023-09-25 17:39:31 +08:00 |
|