Commit Graph

1864 Commits

Author SHA1 Message Date
lwl0608 2a09163410 add oid3 2024-02-18 23:51:52 +08:00
lwl0608 c61abde23b fff 2024-02-18 23:47:58 +08:00
lwl0608 ef6538528d 支付宝优化 2024-02-18 23:24:52 +08:00
lwl0608 1ce92ce589 fix 2024-02-12 20:31:18 +04:00
lwl0608 d06f3e8c9b change cert 2024-02-12 20:15:26 +04:00
lwl0608 fad48f96fd add alipay 2024-02-12 19:56:29 +04:00
lwl0608 13261a3f8d add alipay ymkj 2024-02-12 19:41:41 +04:00
chenhao 0dd2a5c647 Merge pull request 'by Robin at 20240207;' (#122) from feat-20240117-001-Robin into test
Reviewed-on: #122
2024-02-07 15:16:58 +08:00
Leufolium 1f44a063f7 by Robin at 20240207; 2024-02-07 15:15:57 +08:00
chenhao f7a823dfd6 Merge pull request 'fix query audit bug' (#121) from feat-20240117-001-Robin into test
Reviewed-on: #121
2024-02-07 14:44:21 +08:00
Leufolium d195f05661 fix query audit bug 2024-02-07 14:42:50 +08:00
chenhao 08dd5a90ee Merge pull request 'by Robin at 20240207; fix error' (#120) from feat-20240117-001-Robin into test
Reviewed-on: #120
2024-02-07 14:41:06 +08:00
Leufolium cffaa2c880 by Robin at 20240207; fix error 2024-02-07 14:39:18 +08:00
chenhao f4b67bdff5 Merge pull request 'by Robin at 20240207' (#119) from feat-20240117-001-Robin into test
Reviewed-on: #119
2024-02-07 14:08:17 +08:00
Leufolium a1bb6f4a01 by Robin at 20240207 2024-02-07 14:06:05 +08:00
chenhao f039a1e58b Merge pull request 'conf-test-0117' (#118) from conf-test-0117 into test
Reviewed-on: #118
2024-02-07 13:59:07 +08:00
Leufolium 8666678a6b Merge branch 'feat-20240117-001-Robin' into conf-test-0117 2024-02-07 13:58:02 +08:00
Leufolium d072565b80 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:52:12 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
chenhao 0b2d00d47e Merge pull request '修复错误码' (#114) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #114
2024-02-07 13:47:58 +08:00
Leufolium c539a93b66 修复错误码 2024-02-07 13:47:08 +08:00
chenhao 4c9c70d334 Merge pull request 'w' (#113) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #113
2024-02-07 13:07:50 +08:00
Leufolium 0e36036b11 w 2024-02-07 13:07:34 +08:00
chenhao a4bd34e4cd Merge pull request '启动定时任务' (#112) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #112
2024-02-07 12:44:03 +08:00
Leufolium 9e3d5de744 启动定时任务 2024-02-07 12:43:47 +08:00
chenhao cc576a5228 Merge pull request 'by Robin at 20240207;' (#111) from feat-20240117-001-Robin into test
Reviewed-on: #111
2024-02-07 12:24:34 +08:00
Leufolium 22c605022d by Robin at 20240207; 2024-02-07 12:23:27 +08:00
chenhao e95d2311cc Merge pull request 'conflict-test-feat-20240117-001-Robin' (#110) from conflict-test-feat-20240117-001-Robin into test
Reviewed-on: #110
2024-02-07 12:17:51 +08:00
Leufolium b19f4eb26d Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001-Robin 2024-02-07 12:15:34 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
lwl0608 632ce1228e SelectMinSizeOssId 2024-02-06 02:51:24 +08:00
lwl0608 ccf4417659 Merge branch 'dev-lwl/wechat' 2024-02-05 23:25:47 +08:00
lwl0608 8b4ed1ad41 wechat pay 2024-02-05 23:25:34 +08:00
lwl0608 1415b2d6ee Merge branch 'dev-lwl/wechat' into test 2024-02-05 22:57:27 +08:00
lwl0608 02a84531e4 fix 2024-02-05 22:57:17 +08:00
chenhao 4eb38b5513 Merge pull request 'feat-IRONFANS-53-20240205-Robin' (#108) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #108
2024-02-05 22:13:37 +08:00
chenhao 7d0460169b Merge pull request 'by Robin at 20240205; content' (#107) from feat-IRONFANS-53-20240205-Robin into test
Reviewed-on: #107
2024-02-05 22:13:02 +08:00
Leufolium 96d6c8e703 by Robin at 20240205; content 2024-02-05 22:12:47 +08:00
chenhao 2be2b3f4a7 revert 21c4f6f18d
revert by Robin at 20240205; content
2024-02-05 22:11:49 +08:00
Leufolium 21c4f6f18d by Robin at 20240205; content 2024-02-05 22:11:00 +08:00
lwl0608 3ed0c7bdeb Merge branch 'dev-lwl/wechat' into test 2024-02-05 22:06:38 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
lwl0608 792783d923 Merge branch 'dev-lwl/wechat' into test 2024-02-05 21:55:56 +08:00
lwl0608 f0050a938e add 2024-02-05 21:55:44 +08:00
chenhao 2a45bd9339 Merge pull request 'cron add clear moment create times' (#106) from feat-20240117-001-Robin into test
Reviewed-on: #106
2024-02-05 21:40:39 +08:00
Leufolium bbf0492655 cron add clear moment create times 2024-02-05 21:39:29 +08:00
chenhao 24e55a6407 Merge pull request 'conflict-test-feat-20240117-001' (#105) from conflict-test-feat-20240117-001 into test
Reviewed-on: #105
2024-02-05 21:35:38 +08:00
Leufolium cbbf3579e4 Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001 2024-02-05 21:35:08 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
Leufolium c8d6c0bc0e cron 2024-02-05 21:21:24 +08:00