wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,745 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

1966 Commits

Author SHA1 Message Date
lwl0608 8b6d6a1435 share_redirect_urls 2024-12-12 14:45:24 +08:00
Robin 248969082d Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-12 14:30:23 +08:00
Robin 22d07db708 by Robin at 20241212 2024-12-12 14:22:53 +08:00
wangxinyu 5b2314bf42 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:57:48 +08:00
wangxinyu baa10d86a2 fix: 主播修改昵称审核 名字展示 2024-12-12 11:57:20 +08:00
wangxinyu 99e38d1251 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:33:10 +08:00
wangxinyu 4e002b9d44 fix: 主播修改昵称审核 mongodb newName 2024-12-12 11:32:45 +08:00
wangxinyu d338364cc1 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 11:07:21 +08:00
wangxinyu c1be559678 fix: 主播修改昵称审核 mongodb UpdateOne 2024-12-12 11:06:59 +08:00
wangxinyu 7ea1302274 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-12 10:56:52 +08:00
wangxinyu 2ec8444167 fix: 主播修改昵称审核 mongodb UpsertOne 2024-12-12 10:56:28 +08:00
chenhao e97e4b3e74 Merge pull request 'feat-IRONFANS-212-Robin' (#883) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/883
 2024-12-11 18:23:53 +08:00
Robin 095d4ed5fb 1 2024-12-11 18:23:35 +08:00
wangxinyu 8df13426a6 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:23:03 +08:00
wangxinyu 83cd231f76 fix: 主播修改昵称审核 upsert 2024-12-11 18:22:19 +08:00
chenhao beccc8b22f Merge pull request 'main' (#881) from main into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/881
 2024-12-11 18:21:17 +08:00
Robin 2a6107c1b9 by Robin at 20241211 2024-12-11 18:20:47 +08:00
Robin afd4108967 by Robin at 20241211 2024-12-11 18:16:16 +08:00
wangxinyu fdba3a67dc Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:00:12 +08:00
wangxinyu 523b277364 test: 测试日志增加 2024-12-11 17:59:40 +08:00
wangxinyu 3dc691906a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 17:34:05 +08:00
wangxinyu 0628cc53d3 fix: 主播修改昵称 自测 数据写入失败修改 2024-12-11 17:33:40 +08:00
wangxinyu 33355be51a fix:合并 2024-12-11 16:54:28 +08:00
wangxinyu 550f72f71a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 
# Conflicts:
#	dbstruct/account.go
 2024-12-11 16:49:59 +08:00
wangxinyu 9c4394fb34 feat: 主播昵称过人审 2024-12-11 16:44:38 +08:00
Robin 7ffa6ba385 by Robin at 20241211 2024-12-11 15:01:24 +08:00
Leufolium 18b474ac5f by Robin at 20241210 2024-12-10 23:36:28 +08:00
lwl0608 5fd6bec4bc add val 2024-12-10 17:11:09 +08:00
wangxinyu bbf48de065 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-10 17:05:38 +08:00
wangxinyu 38b6d24a55 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 16:01:21 +08:00
wangxinyu 1aec8d6534 fix: del todo1 2024-12-10 15:59:15 +08:00
wangxinyu 1fb5625ec0 feat: 主播修改微信昵称通过人审 2024-12-10 15:56:36 +08:00
lwl0608 5e596f2aac bin 2024-12-10 14:51:01 +08:00
lwl0608 2b884bd3fb add multi online 2024-12-10 14:49:57 +08:00
Robin 1cee56614f Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-10 14:44:45 +08:00
Robin c589e06a7b by Robin at 20241210 2024-12-10 14:39:12 +08:00
lwl0608 f97f18ac49 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 14:08:30 +08:00
lwl0608 bacf62d5a9 send ding msg 2024-12-10 14:08:23 +08:00
lwl0608 e3cf856aa7 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 13:34:25 +08:00
lwl0608 e0d8575b78 no sync 2024-12-10 13:34:16 +08:00
wangxinyu eea6d0e028 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:46:49 +08:00
wangxinyu ac659dbc6c feat: 主播微信号不能设置[wxid]开头的初始微信 api接口 2024-12-10 11:46:24 +08:00
lwl0608 4804f72e41 test 2024-12-10 11:42:17 +08:00
lwl0608 666d2a6dfd test 2024-12-10 11:39:16 +08:00
lwl0608 592dfc7aa9 xxx 2024-12-10 11:30:33 +08:00
wangxinyu d479e16329 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:29:24 +08:00
lwl0608 7990465239 f 2024-12-10 11:22:15 +08:00
lwl0608 6bb656ee34 test 2024-12-10 11:21:48 +08:00
lwl0608 02da0b206d Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 11:20:05 +08:00
lwl0608 ea5a11fa17 x 2024-12-10 11:19:42 +08:00
wangxinyu 91f5c64404 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 10:34:50 +08:00
wangxinyu 17902f8c2d fix: 退款详情页增加用户昵称 2024-12-10 10:34:17 +08:00
lwl0608 ce3dbbd907 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:19:47 +08:00
lwl0608 95a927c26f fix 2024-12-09 17:19:39 +08:00
lwl0608 29f3073520 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:17:29 +08:00
lwl0608 e33b76ba66 fix xinyidaole 2024-12-09 17:17:13 +08:00
lwl0608 7098dd4120 fix 2024-12-09 17:14:42 +08:00
lwl0608 7e3874e752 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:11:39 +08:00
lwl0608 2848425315 fix 2024-12-09 17:11:34 +08:00
lwl0608 3c60ebc417 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:00:01 +08:00
lwl0608 2ade2cf3b4 fix 2024-12-09 16:59:58 +08:00
lwl0608 bb529375d8 merge 2024-12-09 16:44:34 +08:00
lwl0608 293dd70d67 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 16:44:14 +08:00
lwl0608 3a873c13a3 add 2024-12-09 16:44:08 +08:00
lwl0608 b6085d518a Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 16:32:44 +08:00
lwl0608 724249bf6a cancel ws 2024-12-09 16:32:37 +08:00
lwl0608 e59615c963 merge 2024-12-09 16:28:10 +08:00
chenhao 67c3dfc8af Merge pull request 'by Robin at 20241209' (#875) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/875
 2024-12-09 16:26:11 +08:00
Robin 16b2d31fb5 by Robin at 20241209 2024-12-09 16:24:52 +08:00
lwl0608 87e344c636 Merge branch 'dev-lwl/withraw_sync_alipay' into test 
# Conflicts:
#	app/mix/dao/mongo.go
#	app/mix/dao/mongo_vas.go
#	dbstruct/vas_mongo.go
 2024-12-09 16:20:13 +08:00
wangxinyu d973389e98 feat: 主播微信号不能设置[wxid]开头的初始微信 2024-12-09 16:18:43 +08:00
lwl0608 00c4baba5f /withraw_sync_alipay 2024-12-09 16:08:19 +08:00
wangxinyu aeb26c06b7 Merge remote-tracking branch 'origin/test' into test 2024-12-09 15:12:01 +08:00
wangxinyu e365c3b1af Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 15:08:14 +08:00
wangxinyu 7ef275a85e fix: 分页 2024-12-09 15:01:37 +08:00
Robin 3ebc0b6204 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-09 14:48:40 +08:00
wangxinyu 86e6bb4281 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 13:46:32 +08:00
wangxinyu 468b1cbea9 fix: 退款参数校验，非本人id 操作 2024-12-09 12:21:42 +08:00
wangxinyu 1d76ad43c4 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 11:41:34 +08:00
wangxinyu 10af8eab2d fix: list 改成空数组，offset修改 2024-12-09 11:40:55 +08:00
wangxinyu 7f86bc7d9f Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 10:47:27 +08:00
wangxinyu 7a2969236f fix: consts 2024-12-09 10:46:42 +08:00
wangxinyu 4e4b603a43 fix: 参数校验和日志 2024-12-09 10:44:20 +08:00
wangxinyu 87c0ffc9bd Merge branch 'feature-refund_v2-wxy-20241204' into test 
# Conflicts:
#	app/mix/controller/zone_vas_api.go
 2024-12-06 18:17:49 +08:00
wangxinyu 6dc5cbd36a Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into feature-refund_v2-wxy-20241204 2024-12-06 18:15:42 +08:00
wangxinyu 2a9379677b fix: 参数校验 2024-12-06 18:15:28 +08:00
Robin 289b4616ad by Robin at 20241206 2024-12-06 17:41:45 +08:00
wangxinyu 4b2a4d92c6 fix: b_mid 和 mid 逻辑 2024-12-06 16:48:47 +08:00
wangxinyu 944595752c Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 16:35:15 +08:00
wangxinyu bb26a6676b fix: xxl-job ctx不能删除 2024-12-06 16:34:40 +08:00
wangxinyu f65a4464e1 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 16:28:08 +08:00
wangxinyu d90d746c6b fix: mid 2024-12-06 16:26:51 +08:00
Robin 30f874af1f by Robin at 20241206 2024-12-06 15:07:23 +08:00
Robin d73c4d5034 by Robin at 20241206 2024-12-06 13:16:00 +08:00
wangxinyu 19130f931d Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 12:34:54 +08:00
wangxinyu c56de2019c fix: refund_list 入参 Zid 改为 BMid 2024-12-06 12:34:30 +08:00
wangxinyu 174e5045af Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-06 10:58:30 +08:00
wangxinyu 5ee947622a feat:xxl-job 扫描主播审批超时的退款单 2024-12-06 10:58:02 +08:00
wangxinyu 6264ce5b17 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 16:24:00 +08:00
wangxinyu e24b88cb3a fix: int64 2024-12-05 16:23:29 +08:00
Robin 23cfc8a897 by Robin at 20241205 2024-12-05 15:58:08 +08:00
wangxinyu 7cd2ac2d83 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 15:54:58 +08:00
wangxinyu b9bbb70b96 fix: 接口参数 
feat: 审核校验
 2024-12-05 15:54:24 +08:00
wangxinyu f5d8e04dca Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 14:45:51 +08:00
wangxinyu 1e974bc7e5 fix: 接口 debug 错误修改 1 2024-12-05 14:44:39 +08:00
wangxinyu 7c396bccee Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 14:16:08 +08:00
wangxinyu 77ae5fac7e fix: controller req fix 2024-12-05 14:15:28 +08:00
wangxinyu 250e1f72cb Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 13:53:05 +08:00
wangxinyu a939417d72 fix: mongo _id update 2 2024-12-05 13:51:40 +08:00
wangxinyu 96d2c62ae1 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 13:22:13 +08:00
wangxinyu 6b06346550 fix: mongo _id update 2024-12-05 13:21:37 +08:00
wangxinyu 921c97f895 Merge branch 'feature-refund_v2-wxy-20241204' into test 
# Conflicts:
#	app/mix/dao/mongo.go
#	app/mix/dao/mongo_vas.go
#	dbstruct/vas_mongo.go
 2024-12-05 12:58:06 +08:00
wangxinyu cf2da7be16 del:del todo 2024-12-05 12:50:52 +08:00
wangxinyu 05021a4bbb feat:用户退款，主播审核列表、详情、审批接口；用户退款接口修改 2024-12-05 11:51:59 +08:00
lwl0608 0ee6c6e9cd Merge branch 'dev-lwl/xxxxfix' into test 2024-12-05 00:33:52 +08:00
lwl0608 330ffa3a47 fix url 2024-12-05 00:33:43 +08:00
lwl0608 c80b0c3ffa x 2024-12-04 18:02:40 +08:00
lwl0608 701cdf7249 x 2024-12-04 18:00:29 +08:00
lwl0608 05660c5377 x 2024-12-04 17:59:38 +08:00
lwl0608 18b695a94f add 2024-12-04 17:58:01 +08:00
chenhao 3f70ce7a3a Merge pull request 'by Robin at 20241204' (#871) from feat-IRONFANS-249-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/871
 2024-12-04 17:34:17 +08:00
Robin 3cdd0bc0b3 by Robin at 20241204 2024-12-04 17:33:54 +08:00
lwl0608 dc7463b22e fix 2024-12-04 17:08:38 +08:00
lwl0608 09b0701b50 add val 2024-12-04 17:07:30 +08:00
Robin 9970ba8b8e add log 2024-12-04 16:32:00 +08:00
Robin cede272891 by Robin at 20241204 2024-12-04 16:25:13 +08:00
Robin 0baf2e070f Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-04 16:02:36 +08:00
Robin 3d34992b20 by Robin at 20241204 2024-12-04 16:00:52 +08:00
lwl0608 7999575b91 Merge branch 'dev-lwl/opt_share' 2024-12-04 15:01:52 +08:00
chenhao 63f0788aaf Merge pull request 'by Robin at 20241204' (#866) from BUG-20241204 into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/866
 2024-12-04 13:25:50 +08:00
Robin 9ecbeb768a by Robin at 20241204 2024-12-04 13:25:17 +08:00
chenhao a4303fce09 Merge pull request 'by Robin at 20241204' (#864) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/864
 2024-12-04 13:03:04 +08:00
Robin dbf04e88d3 by Robin at 20241204 2024-12-04 13:02:01 +08:00
chenhao 2035a88965 Merge pull request 'by Robin at 20241203' (#863) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/863
 2024-12-03 17:27:05 +08:00
Robin 1c3f6940dc by Robin at 20241203 2024-12-03 17:25:40 +08:00
lwl0608 f20f7b2f8d vas 2024-12-03 16:57:44 +08:00
chenhao a08d31e59c Merge pull request 'feat-IRONFANS-212-Robin' (#862) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/862
 2024-12-03 16:50:34 +08:00
Robin 0c6545087b by Robin at 20241203 2024-12-03 16:49:57 +08:00
lwl0608 fd4d750f7a merge 2024-12-03 16:48:53 +08:00
Robin 06aa01e595 by Robin at 20241203 2024-12-03 16:19:27 +08:00
lwl0608 2a5678f5b0 mod 2024-12-03 15:57:41 +08:00
lwl0608 1464052697 zone_url 2024-12-03 15:54:46 +08:00
chenhao e4ba8891af Merge pull request 'by Robin at 20241203' (#861) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/861
 2024-12-03 15:51:59 +08:00
Robin d8dd440e76 by Robin at 20241203 2024-12-03 15:51:09 +08:00
chenhao 3b4254f521 Merge pull request 'by Robin at 20241203' (#860) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/860
 2024-12-03 15:42:11 +08:00
Robin 9a8483c295 by Robin at 20241203 2024-12-03 15:41:29 +08:00
Robin d3a93f0fbc Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-03 14:53:14 +08:00
Robin 495980a255 by Robin at 20241203 2024-12-03 14:52:07 +08:00
Robin 8a623283c2 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-03 14:05:22 +08:00
Robin 89e840ec75 by Robin at 20241203 2024-12-03 14:00:36 +08:00
lwl0608 04d757c62a Merge branch 'dev-lwl/firenze' 2024-12-03 12:20:53 +08:00
lwl0608 d5bfc13133 Merge branch 'dev-lwl/firenze' into test 2024-12-03 12:20:46 +08:00
lwl0608 fd87db0c61 fix 2024-12-03 12:20:34 +08:00
chenhao 3d4545a1d8 Merge pull request 'by Robin at 20241202' (#854) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/854
 2024-12-02 19:11:00 +08:00
Robin ae5aa3eb87 by Robin at 20241202 2024-12-02 19:10:39 +08:00
chenhao 29a707399c Merge pull request 'by Robin at 20241202' (#853) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/853
 2024-12-02 16:13:09 +08:00
Robin 376e151d32 by Robin at 20241202 2024-12-02 16:12:06 +08:00
Robin 8d1229aa79 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-02 16:02:53 +08:00
Robin fc58ef20a2 by Robin at 20241202 2024-12-02 15:40:17 +08:00
Robin b408f1ff16 by Robin at 20241129 2024-11-29 17:30:12 +08:00
Robin 1ff5c87a88 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into feat-IRONFANS-212-Robin-Rebase2 2024-11-28 16:26:37 +08:00
Robin d46ccbf188 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into test 2024-11-28 16:01:14 +08:00
Robin 04e5e0e5fa by Robin at 20241128 2024-11-28 15:57:09 +08:00
Robin 6a39c8925f by Robin at 20241128 2024-11-28 15:27:40 +08:00
Robin 768e7b48af 1 2024-11-28 10:38:36 +08:00
chenhao 14a0e1ab0e Merge pull request 'by Robin at 20241127' (#849) from feat-IRONFANS-212-Robin-Rebase into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/849
 2024-11-27 16:31:08 +08:00
Robin ab1c8f3716 by Robin at 20241127 2024-11-27 16:30:29 +08:00
Robin 131f55d8bf Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-27 16:25:19 +08:00
Robin f85edfa766 by Robin at 20241127 2024-11-27 16:23:15 +08:00
Robin deb84e1b4e 1 2024-11-27 16:16:08 +08:00
Robin ecb2a418c2 by Robin at 20241127 2024-11-27 15:36:49 +08:00
Robin 7be56f9775 by Robin at 20241127 2024-11-27 15:31:48 +08:00
chenhao 90b1d6e0aa Merge pull request 'by Robin at 20241127' (#846) from feat-IRONFANS-212-Robin-Rebase into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/846
 2024-11-27 13:24:30 +08:00
Robin f03238d753 by Robin at 20241127 2024-11-27 13:19:54 +08:00
Robin 1a83ded7d1 1 2024-11-26 16:52:21 +08:00
Robin 4c2dfa123f by Robin at 20241126 2024-11-26 16:51:46 +08:00
chenhao 268232eaa5 Merge pull request 'conf-212' (#842) from conf-212 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/842
 2024-11-26 16:33:25 +08:00
Robin 7d82065430 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-26 16:31:36 +08:00
chenhao 01dfa921f5 Merge pull request 'feat-IRONFANS-248-Robin' (#841) from feat-IRONFANS-248-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/841
 2024-11-26 16:29:14 +08:00
Robin 4a44dd5646 1 2024-11-26 16:28:46 +08:00
Robin a91904f18f by Robin at 20241126 2024-11-26 16:28:43 +08:00
Robin dd96ceb00c Merge branch 'feat-IRONFANS-248-Robin' into conf-248 2024-11-26 16:16:32 +08:00
Robin f843490b0f by Robin at 20241126 2024-11-26 16:14:20 +08:00
Robin 056df14b1c by Robin at 20241126 2024-11-26 16:11:42 +08:00
chenhao 2c23e3e71c Merge pull request '1' (#838) from feat-IRONFANS-247-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/838
 2024-11-26 15:05:21 +08:00
Robin 9315eb8f18 1 2024-11-26 15:04:58 +08:00
Robin 340e6f400f by Robin at 20241126 2024-11-26 15:02:20 +08:00
Robin 5604e68412 Merge branch 'feat-IRONFANS-247-Robin' into test 2024-11-26 14:47:03 +08:00
Robin 3aed97c805 by Robin at 20241126 2024-11-26 14:44:35 +08:00
chenhao f0ba863b71 Merge pull request '1' (#836) from feat-IRONFANS-248-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/836
 2024-11-26 14:22:48 +08:00
Robin b06038458e 1 2024-11-26 14:22:23 +08:00
chenhao 85ea7bf7d0 Merge pull request '1' (#835) from feat-IRONFANS-248-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/835
 2024-11-26 14:14:57 +08:00
Robin fd7cec8224 1 2024-11-26 14:14:36 +08:00
Robin 5a4ec5bffa by Robin at 20241126 2024-11-26 14:02:22 +08:00
Robin de25330b3e 1 2024-11-25 17:40:43 +08:00
Robin 2a5cf59a19 1 2024-11-25 17:25:46 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
lwl0608 2e59c673b6 Merge branch 'dev-lwl/firenze' into test 2024-11-25 17:08:35 +08:00
lwl0608 f4380e6b52 firenze 2024-11-25 17:08:00 +08:00
Robin fbc716b968 Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:44:21 +08:00