Commit Graph

98 Commits

Author SHA1 Message Date
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +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
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 0150aefdcc Merge branch 'dev_add_shuilai' into test 2024-08-09 15:08:20 +08:00
lwl0608 8fa1d27868 shuilai tf 2024-08-09 15:07:58 +08:00
lwl0608 f8a4c0fbe7 Merge branch 'add_raven' 2024-08-01 10:35:00 +08:00
lwl0608 170bf7af92 Merge branch 'add_raven' into test 2024-07-31 16:43:10 +08:00
lwl0608 6fd0d75f5c add lanxing 02 2024-07-31 16:43:03 +08:00
Leufolium 4540f29515 Merge branch 'feat-IRONFANS-173-Robin' into conflict 2024-07-22 16:02:15 +08:00
Leufolium c3ff7fae4a 1 2024-07-22 15:59:45 +08:00
lwl0608 3bfb560663 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 21:51:28 +08:00
lwl0608 c2973b553f add tiefanzone h5pay 2024-07-17 21:51:24 +08:00
lwl0608 6372e444a8 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 18:06:46 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
chenhao ef971d5d70 Merge pull request 'by Robin at 20240717' (#619) from BUG-20240717 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/619
2024-07-17 14:18:59 +08:00
Leufolium a6798e71ff by Robin at 20240717 2024-07-17 14:18:41 +08:00
lwl0608 24ff2b0a75 fix 2024-07-11 10:04:10 +08:00
lwl0608 0dc67b4291 lanxing 01 2024-07-03 16:05:46 +08:00
lwl0608 661db0acc4 Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:59:33 +08:00
lwl0608 8702c44a2c fix config 2024-07-03 15:59:27 +08:00
lwl0608 b035e3430f Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:54:50 +08:00
lwl0608 6f6cf0c7cf add xl01 2024-07-03 15:54:41 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
Leufolium 4f2d33e674 Merge branch 'feat-IRONFANS-148-Robin' into cfl 2024-06-18 19:46:31 +08:00
Leufolium ae4b8558f3 by Robin at 20240618 2024-06-18 19:40:09 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
2024-06-13 12:32:16 +08:00
Leufolium 559976b33a by Robin at 20240611 2024-06-11 19:40:35 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 53797b066c yop 2024-05-27 16:50:58 +08:00
lwl0608 675a6e42fb yeepay 2024-05-27 16:48:25 +08:00
Leufolium b221fa7bfb Merge branch 'feat-IRONFANS-133-Robin' into conflict 2024-05-24 03:55:36 +08:00
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
chenhao 31ac9a3b98 revert 4f67673057
revert by Robin at 20240524
2024-05-24 03:32:04 +08:00
Leufolium 4f67673057 by Robin at 20240524 2024-05-24 03:18:12 +08:00
Leufolium 7701447d64 Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conf 2024-05-24 02:59:59 +08:00
Leufolium 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
Leufolium c9fa28946f Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-23 22:44:51 +08:00
Leufolium 124dd84c83 by Robin at 20240523 2024-05-23 22:39:37 +08:00
chenhao 95648a7085 Merge pull request 'return' (#477) from feat-IRONFANS-133-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/477
2024-05-23 04:46:07 +08:00
Leufolium c58b220d7c return 2024-05-23 04:45:37 +08:00
Leufolium b09aca1e91 Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into test 2024-05-23 04:43:14 +08:00