Commit Graph

1949 Commits

Author SHA1 Message Date
chenhao 73130e4a4b Merge pull request 'add api' (#710) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/710
2024-08-29 14:29:38 +08:00
Leufolium eb4f10506e add api 2024-08-29 14:28:52 +08:00
lwl0608 f2cc03bcd5 Merge branch 'dev_rb_zone_refund' into test 2024-08-27 17:10:26 +08:00
lwl0608 3ac4248f26 merge 2024-08-27 17:10:20 +08:00
lwl0608 b72ea86f5b merge 2024-08-27 17:06:03 +08:00
lwl0608 d5f00f015d rollback z refund 2024-08-27 16:57:50 +08:00
lwl0608 21feca85b8 Merge branch 'dev_search_zmember' into test 2024-08-26 14:44:01 +08:00
lwl0608 dfa425b64d zm 2024-08-26 14:43:57 +08:00
chenhao db5788bb51 Merge pull request '1' (#709) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/709
2024-08-23 17:08:13 +08:00
Leufolium 00eca63c57 1 2024-08-23 17:07:56 +08:00
chenhao ab0362bcd4 Merge pull request 'by Robin at 20240823' (#708) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/708
2024-08-23 17:05:01 +08:00
Leufolium 54bbcf331e by Robin at 20240823 2024-08-23 17:04:31 +08:00
chenhao 30d1f7d97f Merge pull request 'by Robin at 20240823' (#707) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/707
2024-08-23 16:54:01 +08:00
Leufolium 95e83bafe2 by Robin at 20240823 2024-08-23 16:53:36 +08:00
chenhao bd5b4798f6 Merge pull request 'by Robin at 20240823' (#706) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/706
2024-08-23 16:39:38 +08:00
Leufolium 1e961c9866 by Robin at 20240823 2024-08-23 16:39:19 +08:00
chenhao a5a62a6008 Merge pull request 'conflict' (#705) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/705
2024-08-23 16:21:20 +08:00
Leufolium 288fa990c5 Merge branch 'feat-IRONFANS-210-Robin' into conflict 2024-08-23 16:20:39 +08:00
Leufolium 8bb1042d17 by Robin at 20240823 2024-08-23 16:17:32 +08:00
chenhao a711d91368 Merge pull request 'by Robin at 20240822' (#703) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/703
2024-08-22 18:12:44 +08:00
Leufolium 964de65ecf by Robin at 20240822 2024-08-22 18:12:24 +08:00
Leufolium ebaecc58e9 1 2024-08-22 12:54:31 +08:00
chenhao 50974050a3 Merge pull request 'by Robin at 20240822' (#702) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/702
2024-08-22 12:19:39 +08:00
Leufolium 75413625fd by Robin at 20240822 2024-08-22 12:19:01 +08:00
chenhao c5f8b07beb Merge pull request 'by Robin at 20240821' (#701) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/701
2024-08-21 22:20:42 +08:00
Leufolium 18e50bbd86 by Robin at 20240821 2024-08-21 22:19:56 +08:00
lwl0608 7485a02f11 Merge branch 'dev_search_zmember' into test 2024-08-21 10:40:43 +08:00
lwl0608 b78a44d341 add apis 2024-08-21 10:40:36 +08:00
chenhao 9bf37ecd11 Merge pull request 'by Robin at 20240820; no zone price' (#700) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/700
2024-08-20 18:48:12 +08:00
Leufolium 7a3754550f by Robin at 20240820; no zone price 2024-08-20 18:47:56 +08:00
lwl0608 143492deec Merge branch 'dev_anliang' into test 2024-08-20 17:58:52 +08:00
lwl0608 087eaaf786 xxx 2024-08-20 17:58:47 +08:00
chenhao 25a5820fdf Merge pull request 'by Robin at 20240820' (#699) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/699
2024-08-20 17:39:15 +08:00
Leufolium 58e5c6ab1d by Robin at 20240820 2024-08-20 17:35:50 +08:00
chenhao 1284d85f04 Merge pull request 'by Robin at 20240819' (#698) from feat-IRONFANS-201-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/698
2024-08-19 13:09:36 +08:00
Leufolium 49905a4c56 by Robin at 20240819 2024-08-19 13:05:29 +08:00
lwl0608 64c6ee4fec Merge branch 'dev_search_zmember' into test 2024-08-16 16:47:25 +08:00
lwl0608 0bc00d03a8 filetest 2024-08-16 16:47:21 +08:00
lwl0608 fc62b86ae5 Merge branch 'dev_search_zmember' into test 2024-08-16 15:59:27 +08:00
lwl0608 7094b703c9 https://file.wishpaldev.tech/ 2024-08-16 15:59:20 +08:00
Leufolium cfbca174b7 1 2024-08-16 07:13:52 +08:00
Leufolium a771a1e89a Merge branch 'feat-IRONFANS-198-Robin' into test 2024-08-16 07:10:54 +08:00
Leufolium 5abd6883d4 by Robin at 20240816 2024-08-16 07:06:12 +08:00
Leufolium d4cff8cc01 by Robin at 20240816 2024-08-16 06:14:55 +08:00
Leufolium 4e0afaa067 by Robin at 20240815 2024-08-15 07:07:39 +08:00
lwl0608 46f32414a8 fix tocken 2024-08-14 11:13:29 +08:00
lwl0608 799ab5c273 Merge branch 'dev_search_zmember' into test 2024-08-14 11:05:22 +08:00
lwl0608 58abe323eb stdout 2024-08-14 11:05:15 +08:00
lwl0608 a3a98587f3 merge 2024-08-14 11:02:26 +08:00
lwl0608 b6338fb391 search 2024-08-14 11:01:03 +08:00