Commit Graph

72 Commits

Author SHA1 Message Date
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
lwl0608 19f60097ff cdn test 2024-03-08 15:49:57 +08:00
lwl0608 93048a1a4b cdn test 2024-03-08 15:49:32 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
Leufolium b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao a1f3e5b4ff Merge pull request 'by Robin at 20240229; fix' (#149) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/149
2024-02-29 01:50:14 +08:00
Leufolium 42f56872b9 by Robin at 20240229; fix 2024-02-29 01:48:51 +08:00
chenhao c2a010ff26 Merge pull request 'by Robin at 20240227;' (#141) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/141
2024-02-27 02:21:40 +08:00
Leufolium 9e935ee8df by Robin at 20240227; 2024-02-27 02:21:24 +08:00
chenhao baead8176e Merge pull request 'by Robin at 20240227;fix' (#138) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/138
2024-02-27 01:05:56 +08:00
Leufolium c3db97077b by Robin at 20240227;fix 2024-02-27 01:05:14 +08:00
chenhao 4903267633 Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
2024-02-27 00:55:59 +08:00
lwl0608 48d058610d add wxpayh5 2024-02-26 19:28:03 +08:00
lwl0608 9b9b84c89f alipay change myts 2024-02-24 23:20:27 +08:00
Leufolium 86be2a9a84 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-22 22:31:20 +08:00
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 19de07fbe4 by Robin at 20240221; change moment audit logic 2024-02-21 18:04:01 +08:00
lwl0608 59f206a612 recover apply 2024-02-21 11:36:21 +08:00
lwl0608 201e1f4c5c wx jsapi 2024-02-20 23:05:24 +08:00
lwl0608 da9203fe64 fix 2024-02-19 21:04:45 +08:00
lwl0608 be2eaa5744 add oid3 2024-02-19 09:05:49 +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 13261a3f8d add alipay ymkj 2024-02-12 19:41:41 +04:00
Leufolium 1f44a063f7 by Robin at 20240207; 2024-02-07 15:15:57 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +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 f0050a938e add 2024-02-05 21:55:44 +08:00
Leufolium eeccbf6315 Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin 2024-02-05 21:26:22 +08:00
lwl0608 2261c021fa add config 2024-02-05 21:16:49 +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
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 b3809eddf5 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-01 20:10:02 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
Leufolium f1ffbf473a by Robin at 20240201; 2024-02-01 09:02:11 +08:00
Leufolium 9430918b7b by Robin at 20240120; fix 2024-01-20 18:48:38 +08:00
Leufolium a52ac4dfa7 by Robin at 20240120;l fix 2024-01-20 06:33:10 +08:00
Leufolium 04b65a72d2 by Robin at 20240119; fix 2024-01-19 17:31:38 +08:00
Leufolium 1602de1156 by Robin at 20240118; 2024-01-18 18:19:31 +08:00
Leufolium a7c7d5f99e by Robin at 20240116; fix 2024-01-16 21:44:58 +08:00