Commit Graph

1146 Commits

Author SHA1 Message Date
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +08:00
Leufolium 2e08c98384 1 2024-07-30 12:08:21 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
chenhao 3cdc52c75e Merge pull request '修复json问题' (#647) from feat-IRONFANS-163-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/647
2024-07-23 22:21:13 +08:00
Leufolium 149901c2c9 修复json问题 2024-07-23 22:08:23 +08:00
Leufolium ef768c9129 1 2024-07-23 18:01:47 +08:00
Leufolium 56feffa1f2 Merge branch 'main' of http://121.41.31.146:3000/wishpal_ironfan/service 2024-07-23 17:52:40 +08:00
Leufolium efdf6aeafc 1 2024-07-23 17:52:39 +08:00
chenhao 4933a1517c Merge pull request '1' (#646) from mainconf into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/646
2024-07-23 17:50:11 +08:00
Leufolium d2ac79d076 1 2024-07-23 17:49:54 +08:00
chenhao 379bc6c82b Merge pull request 'mainconf' (#645) from mainconf into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/645
2024-07-23 17:45:10 +08:00
Leufolium b4bd78c501 2 2024-07-23 17:42:43 +08:00
Leufolium 9d7581b521 Merge remote-tracking branch 'origin/main' into mainconf 2024-07-23 17:41:08 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
Leufolium c5343564e3 1 2024-07-23 17:04:07 +08:00
Leufolium 24b52988f2 by Robin at 20240723 2024-07-23 16:37:16 +08:00
chenhao 8fabca75cd Merge pull request 'BUG-20240722' (#640) from BUG-20240722 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/640
2024-07-22 19:31:14 +08:00
Leufolium 2c2564d9dc 1 2024-07-22 19:30:57 +08:00
Leufolium 9bec776bdf 1 2024-07-22 19:30:39 +08:00
chenhao cb17db47a2 Merge pull request 'by Robin at 20240722; fixed Location err' (#639) from BUG-20240722 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/639
2024-07-22 19:23:34 +08:00
Leufolium b1756d3c3d by Robin at 20240722; fixed Location err 2024-07-22 19:23:13 +08:00
Leufolium f83058dc25 Merge branch 'feat-IRONFANS-148-Robin' into mainconf 2024-07-22 19:11:15 +08:00
Leufolium 4df038ad9e 1 2024-07-20 10:21:45 +08:00
lwl0608 9808ff020f Merge branch 'dev-lwl/rollback_zone_status' 2024-07-19 20:37:20 +08:00
lwl0608 bf994af7ab fix errmsg 2024-07-19 20:37:08 +08:00
Leufolium 3b8ed9a4e1 1 2024-07-19 19:13:02 +08:00
Leufolium 8ac99776b2 by Robin at 20240719 2024-07-19 18:11:32 +08:00
lwl0608 4211c887cf fix 2024-07-19 17:53:54 +08:00
lwl0608 9157c5fa08 fix 2024-07-19 17:46:33 +08:00
lwl0608 9c2ba123a2 rollback_zone_exit_status 2024-07-19 11:02:34 +08:00
Leufolium ea7d25b0a9 by Robin at 20240719 2024-07-19 08:32:59 +08:00
Leufolium 494d798351 1 2024-07-18 22:27:36 +08:00
Leufolium 0665b22b3f Merge branch 'main' into feat-IRONFANS-163-Robin 2024-07-18 22:27:10 +08:00
Leufolium 494b27c792 1 2024-07-18 22:13:05 +08:00
lwl0608 d5af0d750d 1:20 lanxing:miyuan 2024-07-18 22:12:43 +08:00
Leufolium 33f7406ece by Robin at 20240718 2024-07-18 22:05:49 +08:00
Leufolium b96a1eaefd by Robin at 20240718 2024-07-18 19:30:59 +08:00
lwl0608 c2973b553f add tiefanzone h5pay 2024-07-17 21:51:24 +08:00
Leufolium 7c24f50709 1 2024-07-17 18:32:14 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
lwl0608 f01f9a3ecb 1 2024-07-17 17:51:08 +08:00
Leufolium 7d22149037 1 2024-07-17 17:12:37 +08:00
Leufolium 441433e65c by Robin at 20240717 2024-07-17 17:10:04 +08:00
chenhao bf7666ba01 Merge pull request 'by Robin at 20240717' (#620) from BUG-20240717 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/620
2024-07-17 14:19:10 +08:00
Leufolium a6798e71ff by Robin at 20240717 2024-07-17 14:18:41 +08:00