Commit Graph

204 Commits

Author SHA1 Message Date
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 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
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 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
Leufolium 96d6c8e703 by Robin at 20240205; content 2024-02-05 22:12:47 +08:00
lwl0608 2793229b6c fix 2024-02-05 22:06:28 +08:00
lwl0608 f0050a938e add 2024-02-05 21:55:44 +08:00
Leufolium c8d6c0bc0e cron 2024-02-05 21:21:24 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +08:00
chenhao 5a4ecf01fe Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#101) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #101
2024-02-05 19:11:08 +08:00
Leufolium 87c431ce8e return info 2024-02-05 19:09:18 +08:00
Leufolium 9178b4a5ce by Robin at 20240205 2024-02-05 19:06:42 +08:00
Leufolium 242074a491 fix null 2024-02-05 19:03:35 +08:00
chenhao ed1eb7b461 Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#96) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #96
2024-02-05 18:52:28 +08:00
Leufolium 27e8d492cc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-40-20240125-Robin 2024-02-05 18:51:18 +08:00
Leufolium 9e85281c9f by Robin at 20240205; add op moment list by mid 2024-02-05 18:47:51 +08:00
lwl0608 87ece44a9a wechat 2024-02-05 01:15:29 +08:00
chenhao 4346b953d6 Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main
Reviewed-on: #92
2024-02-04 17:01:34 +08:00
chenhao c7962fa4e8 Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#90) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #90
2024-02-04 08:04:44 +08:00
Leufolium e8eabcc42e by Robin at 20240204; moment list by mid 2024-02-04 08:04:13 +08:00
lwl0608 332bcc87fc wx 2024-02-03 17:58:40 +08:00
lwl0608 9aff51c92b fix 2024-02-03 17:27:10 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
Leufolium 2a60148d49 by Robin at 20240201; 2024-02-01 11:07:38 +08:00
Leufolium 52279af4a9 by Robin at 20240201; 2024-02-01 10:19:44 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium 9297aa8fbd by Robin at 20240127; add op list by mid account 2024-01-27 16:50:39 +08:00
chenhao 13ec1265e3 Merge pull request 'by Robin at 20240127; fix op delete' (#82) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #82
2024-01-27 02:08:46 +08:00
Leufolium 20c1a9bd69 by Robin at 20240127; fix op delete 2024-01-27 02:04:17 +08:00
chenhao a1bae6eb21 Merge pull request 'by Robin at 20240116; fix' (#78) from feat-20230116-001-Robin into main
Reviewed-on: #78
2024-01-25 08:42:43 +08:00
chenhao 5761f02b8b Merge pull request 'by Robin at 20240123; add consume his' (#77) from feat-20240121-001-Robin into main
Reviewed-on: #77
2024-01-23 20:57:59 +08:00
Leufolium 68a75a8184 by Robin at 20240123; add consume his 2024-01-23 20:57:30 +08:00
chenhao 729627e2b3 Merge pull request 'by Robin at 20240123; fix' (#75) from feat-20240121-001-Robin into main
Reviewed-on: #75
2024-01-23 19:39:46 +08:00
Leufolium ff9e1acf68 by Robin at 20240123; fix 2024-01-23 19:36:49 +08:00
chenhao 6a0f2cdde2 Merge pull request 'feat-20240121-001-Robin' (#72) from feat-20240121-001-Robin into main
Reviewed-on: #72
2024-01-23 19:12:49 +08:00
Leufolium 48d1cb1b88 Merge remote-tracking branch 'origin/main' into feat-20240121-001-Robin 2024-01-23 19:12:27 +08:00
Leufolium 9eac3af283 by Robin at 20240123; return_url alteration 2024-01-23 19:08:59 +08:00
chenhao c407785e18 Merge pull request 'conflict-feat-20240112-001-main' (#69) from conflict-feat-20240112-001-main into main
Reviewed-on: #69
2024-01-23 18:02:57 +08:00