Commit Graph

1137 Commits

Author SHA1 Message Date
Leufolium f21050d3f2 by Robin at 20240516 2024-05-16 14:09:31 +08:00
lwl0608 ca2afc7e0a Merge branch 'dev-lwl/order' into test 2024-05-15 20:01:50 +08:00
lwl0608 8ba9674a27 fix data 2024-05-15 20:01:40 +08:00
lwl0608 601ef2b715 Merge branch 'dev-lwl/order' into test 2024-05-15 19:58:18 +08:00
lwl0608 ce579b9701 add log 2024-05-15 19:57:52 +08:00
lwl0608 1ef1d9e4fa Merge branch 'dev-lwl/order' into test 2024-05-15 19:24:40 +08:00
lwl0608 9282680375 fix alipay notify url 2024-05-15 19:24:34 +08:00
lwl0608 bc1163e806 Merge branch 'dev-lwl/order' into test 2024-05-15 19:12:38 +08:00
lwl0608 9b8b37d5e1 fix 2024-05-15 19:12:22 +08:00
chenhao a40a5b63e1 Merge pull request 'conf' (#443) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/443
2024-05-15 16:32:55 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 07b587475b by Robin at 20240515 2024-05-15 16:29:59 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +08:00
lwl0608 698ad85bf0 fix 2024-05-15 14:22:54 +08:00
lwl0608 534fe16e05 fix 2024-05-15 14:21:01 +08:00
lwl0608 83f659df3a Merge branch 'dev-lwl/with' into test 2024-05-15 12:40:33 +08:00
lwl0608 c12b1e1164 fix 2024-05-15 12:40:21 +08:00
Leufolium 0e6368fc0c by Robin at 20240515 2024-05-15 12:13:02 +08:00
lwl0608 b6e45575ff merge 2024-05-15 10:22:18 +08:00
lwl0608 936929b0ec fix moment_order_list 2024-05-15 10:21:18 +08:00
chenhao d2f17ad50a Merge pull request 'by Robin at 20240515' (#440) from feat-IRONFANS-127-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/440
2024-05-15 10:17:25 +08:00
Leufolium 17c25c5128 by Robin at 20240515 2024-05-15 10:16:57 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +08:00
chenhao 6dc7bf2d66 Merge pull request 'by Robin at 20240514' (#439) from feat-IRONFANS-121-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/439
2024-05-15 08:41:58 +08:00
chenhao dbc5d4f9c4 Merge pull request 'feat-IRONFANS-117-Robin' (#438) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/438
2024-05-14 23:02:19 +08:00
Leufolium 211bd4ba79 by Robin at 20240514 2024-05-14 23:01:58 +08:00
Leufolium a523664f3a by Robin at 20240514 2024-05-14 22:58:12 +08:00
chenhao 1baa4cbbfe Merge pull request 'by Robin at 20240514' (#437) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/437
2024-05-14 22:51:02 +08:00
Leufolium 5818cc5785 by Robin at 20240514 2024-05-14 22:50:42 +08:00
chenhao 75338ff450 Merge pull request 'by Robin at 20240514' (#436) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/436
2024-05-14 22:44:12 +08:00
Leufolium 7ab0b8ae82 by Robin at 20240514 2024-05-14 22:43:52 +08:00
chenhao bd56e41af7 Merge pull request 'conflict' (#435) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/435
2024-05-14 22:34:35 +08:00
Leufolium a94e614427 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into conflict 2024-05-14 22:34:15 +08:00
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +08:00
chenhao c63219ac5c Merge pull request 'main' (#433) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/433
2024-05-14 20:48:08 +08:00
chenhao e44b89cee8 Merge pull request 'by Robin at 20240514' (#432) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/432
2024-05-14 20:47:34 +08:00
Leufolium 4130795c11 by Robin at 20240514 2024-05-14 20:47:20 +08:00
chenhao 69a67c1221 Merge pull request 'main' (#431) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/431
2024-05-14 20:36:36 +08:00
chenhao df70260ddc Merge pull request 'by Robin at 20240514' (#430) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/430
2024-05-14 20:36:27 +08:00
Leufolium 1293757049 by Robin at 20240514 2024-05-14 20:36:01 +08:00
chenhao 1c6cfa8874 Merge pull request 'by Robin at 20240514' (#429) from feat-IRONFANS-121-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/429
2024-05-14 17:23:12 +08:00
Leufolium 3dc9ca1665 by Robin at 20240514 2024-05-14 17:22:40 +08:00
lwl0608 961f37af1b fix 2024-05-14 10:58:07 +08:00
lwl0608 4bf3a744b3 本周迭代 2024-05-14 10:55:49 +08:00
lwl0608 a9f7be9f7b merge 2024-05-14 09:56:16 +08:00
lwl0608 77bb52fe88 create_order 2024-05-14 09:52:23 +08:00
chenhao 36cc467854 Merge pull request 'feat-IRONFANS-117-Robin' (#428) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/428
2024-05-13 12:28:45 +08:00
chenhao 5ffd2d6085 Merge pull request 'by Robin at 20240512' (#427) from feat-IRONFANS-114-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/427
2024-05-12 16:16:43 +08:00
Leufolium 5cf69a9244 by Robin at 20240512 2024-05-12 16:16:14 +08:00