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
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
Robin 4605bf9347 1 2024-11-25 15:42:46 +08:00
Robin fd0142a96a Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:24:18 +08:00
Robin 10c733b972 by Robin at 20241125; guild registration 2024-11-25 15:15:29 +08:00
chenhao 31fc3080a6 Merge pull request '1' (#830) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/830
 2024-11-22 17:05:00 +08:00
Robin bdeeb00668 1 2024-11-22 17:04:34 +08:00
chenhao dc6ec69c42 Merge pull request 'feat-IRONFANS-212-Robin' (#829) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/829
 2024-11-22 16:53:49 +08:00
Robin 452b79444e 1 2024-11-22 16:52:00 +08:00
chenhao 3ae882883f Merge pull request '1' (#827) from feat-IRONFANS-245-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/827
 2024-11-22 16:11:11 +08:00
Robin af1d5137ad 1 2024-11-22 16:10:52 +08:00
Robin a169791939 Merge branch 'feat-IRONFANS-245-Robin' into conf-245 2024-11-22 14:41:42 +08:00
Robin 909ea06a44 by Robin at 20241122 2024-11-22 14:39:41 +08:00
chenhao e3057c235c Merge pull request 'BUG-20241119' (#823) from BUG-20241119 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/823
 2024-11-21 18:45:23 +08:00
chenhao 9ffc4864e9 Merge pull request '1' (#821) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/821
 2024-11-21 17:45:16 +08:00
Robin 3e7cdc9712 1 2024-11-21 17:44:53 +08:00
chenhao 904c7dc7ae Merge pull request '1' (#820) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/820
 2024-11-21 17:16:51 +08:00
Robin 213d7b891c 1 2024-11-21 17:16:32 +08:00
chenhao 936127f8f5 Merge pull request 'by Robin at 20241121' (#819) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/819
 2024-11-21 16:20:18 +08:00
Robin 1b3de32c39 by Robin at 20241121 2024-11-21 16:19:58 +08:00
chenhao 7677ebe0dd Merge pull request 'BUG-20241119' (#818) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/818
 2024-11-21 14:48:14 +08:00
Robin 660d636141 1 2024-11-21 14:47:44 +08:00
Robin 235fab0940 1 2024-11-21 14:44:44 +08:00
chenhao e72f9f9614 Merge pull request 'by Robin at 20241121' (#817) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/817
 2024-11-21 14:17:10 +08:00
Leufolium 1ac849645c by Robin at 20241121 2024-11-21 14:15:55 +08:00
chenhao d4f38b5d34 Merge pull request 'by Robin at 20241120' (#816) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/816
 2024-11-20 18:38:01 +08:00
Leufolium 76fe6ef75e by Robin at 20241120 2024-11-20 18:36:35 +08:00
chenhao d264759e4e Merge pull request '1' (#815) from feat-IRONFANS-242-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/815
 2024-11-20 17:24:43 +08:00
Leufolium f0db107a73 1 2024-11-20 17:24:28 +08:00
chenhao dd57f3e920 Merge pull request 'BUG-20241119' (#814) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/814
 2024-11-20 17:19:13 +08:00
Leufolium 5896407484 1 2024-11-20 17:18:56 +08:00
Leufolium 72fca3c8ca 1 2024-11-20 17:17:11 +08:00
chenhao c462095029 Merge pull request '1' (#813) from feat-IRONFANS-242-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/813
 2024-11-20 17:12:26 +08:00
Leufolium 6cf254e1c7 1 2024-11-20 17:12:05 +08:00
chenhao 9599275a4e Merge pull request '1' (#812) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/812
 2024-11-20 17:07:33 +08:00
Leufolium eee2f23367 1 2024-11-20 17:07:15 +08:00
chenhao b88cbe764e Merge pull request '1' (#811) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/811
 2024-11-20 17:05:10 +08:00
Leufolium 4d24482f25 1 2024-11-20 17:04:43 +08:00
chenhao 160c54dfba Merge pull request 'BUG-20241119' (#810) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/810
 2024-11-20 16:46:27 +08:00
Leufolium 067de8dcc4 by Robin at 20241120 2024-11-20 16:45:58 +08:00
Leufolium 697fb1aa8b 1 2024-11-20 15:20:17 +08:00
chenhao 715a01b0f7 Merge pull request '1' (#809) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/809
 2024-11-19 16:00:26 +08:00
Leufolium 73b7488edf 1 2024-11-19 15:59:52 +08:00
chenhao df682d599b Merge pull request '1' (#808) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/808
 2024-11-19 15:57:13 +08:00
Leufolium 5b273b0949 1 2024-11-19 15:56:46 +08:00
Leufolium 718b5bea26 Merge branch 'BUG-20241119' into test 2024-11-19 15:39:47 +08:00
Leufolium 1943a4f53d 1 2024-11-19 15:39:01 +08:00
Leufolium 86121cdda5 1 2024-11-19 15:32:46 +08:00
Leufolium 0329c89ae9 1 2024-11-19 15:24:04 +08:00
Leufolium 655bd7417c 1 2024-11-19 14:45:58 +08:00
Leufolium 86dfc695d7 1 2024-11-19 14:45:26 +08:00
Leufolium e014d2b80a Merge branch 'feat-IRONFANS-235-Robin' into test 2024-11-18 17:00:49 +08:00
chenhao 25352fbf06 Merge pull request '1' (#805) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/805
 2024-11-18 16:57:04 +08:00
Leufolium c72afa8b57 1 2024-11-18 16:56:44 +08:00
chenhao dc82c76c4f Merge pull request 'feat-IRONFANS-235-Robin' (#804) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/804
 2024-11-18 16:44:46 +08:00
Leufolium f6a60004fe Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 16:21:46 +08:00
Leufolium 2cd01bf3d8 1 2024-11-18 16:20:23 +08:00
Leufolium e493a130fe 1 2024-11-18 16:18:09 +08:00
Leufolium 761499bef5 Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 15:18:49 +08:00
Leufolium 98cf6b3f4b by Robin at 20241118 2024-11-18 15:16:10 +08:00
Leufolium 5cb17dc87b Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-15 15:10:49 +08:00
Leufolium e6ab8613cc 1 2024-11-15 15:08:22 +08:00
Leufolium 3a9b4a6827 by Robin at 20241115 2024-11-15 15:00:37 +08:00
Leufolium a74773681e by Robin at 20241114 2024-11-14 16:30:59 +08:00
chenhao da1f53f171 Merge pull request 'by Robin at 20241111' (#795) from feat-IRONFANS-238-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/795
 2024-11-13 17:49:10 +08:00
chenhao f74a126912 Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
 2024-11-12 17:38:29 +08:00
Leufolium 9277356df2 by Robin at 20241112 2024-11-12 17:37:18 +08:00
Leufolium 4606b327c5 Merge branch 'feat-IRONFANS-238-Robin' into feat-IRONFANS-212-Robin 2024-11-12 16:36:26 +08:00
Leufolium 0870b550b8 by Robin at 20241112 2024-11-12 16:34:26 +08:00
lwl0608 30db4e8570 Merge branch 'dev_fi_xxx' into test 2024-11-11 21:23:40 +08:00
lwl0608 12c2fd4838 fix 2024-11-11 21:23:31 +08:00
Leufolium 8af6b0ae1f by Robin at 20241111 2024-11-11 15:38:06 +08:00
Leufolium d8e3be1fc7 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-11 15:25:43 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
Leufolium 1de4fba176 1 2024-11-11 15:12:48 +08:00
chenhao fa91563548 Merge pull request 'by Robin at 20241111' (#789) from feat-IRONFANS-238-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/789
 2024-11-11 13:46:32 +08:00
chenhao 498600ae10 Merge pull request 'feat-IRONFANS-212-Robin' (#786) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/786
 2024-11-11 13:42:23 +08:00
Leufolium 7ab72de288 1 2024-11-11 13:41:58 +08:00
Leufolium 43fd646524 by Robin at 20241111 2024-11-11 13:34:25 +08:00
lwl0608 71229486fb Merge branch 'dev_fi_xxx' into test 2024-11-08 16:40:06 +08:00
lwl0608 a1dd4cdee2 fix 2024-11-08 16:40:01 +08:00
Leufolium 06cf21e8d6 by Robin at 20241108; curry 2024-11-08 16:30:02 +08:00
chenhao 135732a173 Merge pull request 'by Robin at 20241108' (#783) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/783
 2024-11-08 11:18:25 +08:00
Leufolium 747cc25edb by Robin at 20241108 2024-11-08 11:17:47 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium d685855fc8 by Robin at 20241107 2024-11-07 18:25:12 +08:00
Leufolium a9f548d600 1 2024-11-07 18:22:39 +08:00
Leufolium 6706183f44 by Robin at 20241107 2024-11-07 17:20:34 +08:00
Leufolium 9b830999aa by Robin at 20241107 2024-11-07 17:05:13 +08:00
Leufolium 521d7694c2 by Robin at 20241107 2024-11-07 12:48:43 +08:00
Leufolium 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 31d9260a5a by Robin at 20241106 2024-11-06 15:58:37 +08:00
Leufolium 2cde89a882 Merge remote-tracking branch 'origin/main' into test 2024-11-05 21:30:16 +08:00
Leufolium ba0a510301 1 2024-11-05 21:22:17 +08:00
Leufolium 7a4199503d by Robin at 20241105 2024-11-05 11:44:33 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +08:00
Leufolium 0277f51c12 Merge remote-tracking branch 'origin/main' into mtest 1 2024-11-01 16:28:07 +08:00
Leufolium 1abe2c1cfb by Robin at 20241101 2024-11-01 16:09:59 +08:00
Leufolium 680cefa724 1 2024-11-01 15:35:45 +08:00
chenhao 6f3d4a9527 Merge pull request '1' (#776) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/776
 2024-10-30 17:29:00 +08:00
Leufolium 6824ec209c 1 2024-10-30 17:28:43 +08:00
chenhao 4a50dfed50 Merge pull request 'by Robin at 20241030' (#775) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/775
 2024-10-30 17:23:05 +08:00