Commit Graph

90 Commits

Author SHA1 Message Date
wangjinlei
ff5a94b4fe log-slf4j 2023-11-22 17:56:26 +08:00
wangjinlei
2e968fc160 log-slf4j 2023-11-22 11:07:35 +08:00
wangjinlei
57641b2e2a log-slf4j 2023-11-22 10:45:21 +08:00
wangjinlei
825bed5187 20231122.9.43 2023-11-22 09:43:45 +08:00
wangjinlei
c51e56fdf7 20231122.9.43 2023-11-22 09:43:23 +08:00
wangjinlei
01e3f19f82 20231122.9.06 2023-11-22 09:06:45 +08:00
wangjinlei
07f063ecaf 微信支付配置文件转移 2023-11-21 10:15:08 +08:00
wangjinlei
59d5ffb46f 微信支付配置文件转移 2023-11-21 10:10:10 +08:00
wangjinlei
5402c28b31 bug 2023-11-20 16:18:07 +08:00
wangjinlei
d9d6ee68da bug 2023-11-20 14:14:51 +08:00
wangjinlei
ac3e7f30cb 天干地支 2023-11-16 14:30:27 +08:00
wangjinlei
618639af70 国家区域 2023-11-14 13:05:44 +08:00
wangjinlei
900718d358 国家区域 2023-11-14 11:24:43 +08:00
wangjinlei
ccb3b0c1eb bug 2023-11-08 10:17:27 +08:00
wangjinlei
a152865cfe bug 2023-11-07 17:14:15 +08:00
wangjinlei
5b71036241 bug 2023-11-03 17:03:42 +08:00
wangjinlei
b89566bdf2 支付回调不加书bug 2023-11-03 12:06:02 +08:00
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