Commit Graph

2597 Commits

Author SHA1 Message Date
chenhao d1d8c34cbd Merge pull request 'conf-1000063' (#909) from conf-1000063 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/909
2024-12-17 13:38:22 +08:00
Robin 708d110069 Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063 2024-12-17 13:38:06 +08:00
Robin 50e3e76698 by Robin at 20241217 2024-12-17 13:36:31 +08:00
wangxinyu d6b6541c15 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-16 17:49:12 +08:00
wangxinyu d738c8c840 fix:申请入驻接口增加微信昵称审核 2024-12-16 17:48:44 +08:00
Robin a6428df723 Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-16 17:47:12 +08:00
Robin 05dde6d4f2 by Robin at 20241216 2024-12-16 17:46:29 +08:00
chenhao 8a1181469e Merge pull request 'by Robin at 20241216' (#906) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/906
2024-12-16 17:39:12 +08:00
Robin f73b7711da by Robin at 20241216 2024-12-16 17:38:14 +08:00
wangxinyu bf623d2be4 test:退款功能测试修改 2024-12-16 17:01:53 +08:00
chenhao 547600aad1 Merge pull request 'by Robin at 20241216' (#905) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/905
2024-12-16 15:38:13 +08:00
Robin a5db8148b7 by Robin at 20241216 2024-12-16 15:37:44 +08:00
Robin 55a18a8157 Merge branch 'test' of http://121.41.31.146:3000/wishpal_ironfan/service into test 2024-12-16 14:57:11 +08:00
Robin 91bd63d2dd by Robin at 20241216 2024-12-16 14:57:09 +08:00
chenhao 9162ee4ab6 Merge pull request 'feat-IRONFANS-212-Robin' (#904) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/904
2024-12-16 14:29:18 +08:00
Robin 7233ef223e by Robin at 20241216 2024-12-16 14:28:49 +08:00
Robin 7ec5798e11 by Robin at 20241216 2024-12-16 14:10:16 +08:00
chenhao 7228943137 Merge pull request 'conf-1000063' (#903) from conf-1000063 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/903
2024-12-16 13:41:16 +08:00
Robin 317850917a Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063 2024-12-16 13:40:40 +08:00
Robin 2a4343553f 1 2024-12-16 13:39:46 +08:00
chenhao d0adfeac32 Merge pull request 'conf-1000063' (#900) from conf-1000063 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/900
2024-12-16 13:37:44 +08:00
Robin e19c44385d Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063 2024-12-16 13:37:27 +08:00
Robin 131bc242c1 by Robin at 20241216 2024-12-16 13:35:55 +08:00
chenhao 7968e0df10 Merge pull request 'by Robin at 20241213' (#898) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/898
2024-12-13 18:54:20 +08:00
Robin 87da42d38f by Robin at 20241213 2024-12-13 18:54:09 +08:00
chenhao e382ab6754 Merge pull request 'by Robin at 20241213' (#897) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/897
2024-12-13 18:38:47 +08:00
Robin 775595eeb7 by Robin at 20241213 2024-12-13 18:38:30 +08:00
chenhao 51a8a4db1c Merge pull request 'by Robin at 20241213' (#896) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/896
2024-12-13 18:36:40 +08:00
Robin 5d64ee48e9 by Robin at 20241213 2024-12-13 18:36:29 +08:00
chenhao 7be15f04d8 Merge pull request 'by Robin at 20241213' (#895) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/895
2024-12-13 18:26:14 +08:00
Robin 43a75bbf98 by Robin at 20241213 2024-12-13 18:25:56 +08:00
chenhao a6704d9f1e Merge pull request '1' (#894) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/894
2024-12-13 17:51:52 +08:00
Robin f211d50df6 1 2024-12-13 17:50:31 +08:00
chenhao fab9becfb2 Merge pull request 'by Robin at 20241213' (#893) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/893
2024-12-13 17:24:24 +08:00
Robin 29a5827ee5 by Robin at 20241213 2024-12-13 17:23:28 +08:00
chenhao a985a5717d Merge pull request 'feat-IRONFANS-212-Robin' (#892) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/892
2024-12-13 17:22:00 +08:00
Robin 3bab569aa5 by Robin at 20241213 2024-12-13 17:20:26 +08:00
lwl0608 7b099be1bf add LOG 2024-12-13 16:43:14 +08:00
Robin 7bb9bb5c95 1 2024-12-13 15:59:08 +08:00
chenhao 90c2161e56 Merge pull request 'by Robin at 20241213' (#891) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/891
2024-12-13 15:54:52 +08:00
Robin 65d1dfa03e by Robin at 20241213 2024-12-13 15:54:27 +08:00
Robin 6211fab0b3 by Robin at 20241213 2024-12-13 15:48:23 +08:00
chenhao e1b7229895 Merge pull request 'by Robin at 20241213' (#890) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/890
2024-12-13 15:45:51 +08:00
Robin b509ee7de5 by Robin at 20241213 2024-12-13 15:45:31 +08:00
chenhao af9696285e Merge pull request 'feat-IRONFANS-250-Robin' (#889) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/889
2024-12-13 15:27:32 +08:00
Robin 71b4e56b07 by Robin at 20241213 2024-12-13 15:26:24 +08:00
Robin efaefd15a7 by Robin at 20241212 2024-12-13 15:16:31 +08:00
lwl0608 8183e4282c test 2024-12-13 12:08:49 +08:00
Robin 2a42b0c38a by Robin at 20241212 2024-12-12 17:46:16 +08:00
Robin cf680f293d by Robin at 20241212 2024-12-12 16:57:34 +08:00