 lwl0608
|
c72f0555a1
|
Merge branch 'dev-lwl/unlock_opt' into test
|
2024-10-12 16:34:07 +08:00 |
|
lwl0608
|
a1a414d6da
|
fix
|
2024-10-12 16:33:58 +08:00 |
 Leufolium
|
5295ffb251
|
Merge branch 'feat-IRONFANS-229-Robin' into conflict
|
2024-10-11 15:26:52 +08:00 |
|
Leufolium
|
d1921bdab5
|
by Robin at 20241011
|
2024-10-11 15:24:06 +08:00 |
|
lwl0608
|
45bbf40bf3
|
merge
|
2024-10-10 09:00:04 +08:00 |
|
lwl0608
|
cbf4cc764c
|
freeze op
|
2024-10-10 08:59:27 +08:00 |
|
lwl0608
|
2bc8ce98bd
|
init
|
2024-10-09 21:06:26 +08:00 |
|
chenhao
|
3c9e3303d8
|
Merge pull request 'BUG-20241004-Robin' (#743) from BUG-20241004-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/743
|
2024-10-04 17:10:35 +08:00 |
|
Leufolium
|
e6794cf887
|
by Robin at 20241004; fix
|
2024-10-04 17:10:14 +08:00 |
|
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
|
80eabf0a5e
|
Merge branch 'dev_PF' into test
|
2024-09-14 16:25:32 +08:00 |
|
lwl0608
|
dc5da5a647
|
add update pf
|
2024-09-14 16:25:14 +08:00 |
|
chenhao
|
f202adbb5f
|
Merge pull request 'by Robin at 20240912;' (#736) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/736
|
2024-09-12 16:19:11 +08:00 |
|
Leufolium
|
4038b87864
|
by Robin at 20240912;
|
2024-09-12 16:18:48 +08:00 |
|
chenhao
|
6b91c35199
|
Merge pull request 'feat-IRONFANS-212-Robin' (#734) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/734
|
2024-09-12 15:51:32 +08:00 |
|
Leufolium
|
cdb1f9a24a
|
by Robin at 20240912
|
2024-09-12 11:54:16 +08:00 |
|
Leufolium
|
b5f0159358
|
by Robin at 20240911; notificaton
|
2024-09-11 15:44:49 +08:00 |
|
lwl0608
|
7ae2dc5955
|
merge
|
2024-09-04 19:06:53 +08:00 |
|
lwl0608
|
afa4ef12db
|
total
|
2024-09-04 19:05:49 +08:00 |
|
lwl0608
|
eedc49b4b2
|
main
|
2024-09-04 15:23:51 +08:00 |
|
chenhao
|
d7d7501919
|
Merge pull request 'feat-IRONFANS-198-Robin' (#718) from feat-IRONFANS-198-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/718
|
2024-09-02 18:37:03 +08:00 |
|
Leufolium
|
174d4242e7
|
Merge branch 'feat-IRONFANS-212-Robin' into tconflict
|
2024-09-02 13:05:46 +08:00 |
|
Leufolium
|
947b2ed877
|
1
|
2024-09-02 13:04:12 +08:00 |
|
Leufolium
|
715428a777
|
Merge branch 'feat-IRONFANS-212-Robin' into tconflict
|
2024-09-02 13:03:26 +08:00 |
|
Leufolium
|
19cccc907f
|
by Robin at 20240902
|
2024-09-02 12:52:49 +08:00 |
|
Leufolium
|
61a54119b9
|
by Robin at 20240830
|
2024-08-30 16:34:00 +08:00 |
|
chenhao
|
73130e4a4b
|
Merge pull request 'add api' (#710) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/710
|
2024-08-29 14:29:38 +08:00 |
|
Leufolium
|
eb4f10506e
|
add api
|
2024-08-29 14:28:52 +08:00 |
|
lwl0608
|
b72ea86f5b
|
merge
|
2024-08-27 17:06:03 +08:00 |
|
lwl0608
|
d5f00f015d
|
rollback z refund
|
2024-08-27 16:57:50 +08:00 |
|
Leufolium
|
288fa990c5
|
Merge branch 'feat-IRONFANS-210-Robin' into conflict
|
2024-08-23 16:20:39 +08:00 |
|
Leufolium
|
8bb1042d17
|
by Robin at 20240823
|
2024-08-23 16:17:32 +08:00 |
|
lwl0608
|
7485a02f11
|
Merge branch 'dev_search_zmember' into test
|
2024-08-21 10:40:43 +08:00 |
|
lwl0608
|
b78a44d341
|
add apis
|
2024-08-21 10:40:36 +08:00 |
|
chenhao
|
9bf37ecd11
|
Merge pull request 'by Robin at 20240820; no zone price' (#700) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/700
|
2024-08-20 18:48:12 +08:00 |
|
Leufolium
|
7a3754550f
|
by Robin at 20240820; no zone price
|
2024-08-20 18:47:56 +08:00 |
|
chenhao
|
25a5820fdf
|
Merge pull request 'by Robin at 20240820' (#699) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/699
|
2024-08-20 17:39:15 +08:00 |
|
Leufolium
|
58e5c6ab1d
|
by Robin at 20240820
|
2024-08-20 17:35:50 +08:00 |
|
Leufolium
|
a771a1e89a
|
Merge branch 'feat-IRONFANS-198-Robin' into test
|
2024-08-16 07:10:54 +08:00 |
|
Leufolium
|
5abd6883d4
|
by Robin at 20240816
|
2024-08-16 07:06:12 +08:00 |
|
Leufolium
|
d4cff8cc01
|
by Robin at 20240816
|
2024-08-16 06:14:55 +08:00 |
|
Leufolium
|
4e0afaa067
|
by Robin at 20240815
|
2024-08-15 07:07:39 +08:00 |
|
lwl0608
|
a3a98587f3
|
merge
|
2024-08-14 11:02:26 +08:00 |
|
lwl0608
|
b6338fb391
|
search
|
2024-08-14 11:01:03 +08:00 |
|
chenhao
|
ac4bebbf2a
|
Merge pull request 'feat-IRONFANS-191-Robin' (#694) from feat-IRONFANS-191-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/694
|
2024-08-08 18:01:50 +08:00 |
|
chenhao
|
566a86f002
|
Merge pull request 'by Robin at 20240808' (#693) from feat-IRONFANS-191-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/693
|
2024-08-08 18:01:37 +08:00 |
|
Leufolium
|
946c29b8c8
|
by Robin at 20240808
|
2024-08-08 18:00:22 +08:00 |
|
chenhao
|
1b2d0e1a03
|
Merge pull request 'by Robin at 20240808' (#690) from feat-IRONFANS-191-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/690
|
2024-08-08 16:05:20 +08:00 |
|
Leufolium
|
50d3ab3040
|
by Robin at 20240808
|
2024-08-08 16:04:50 +08:00 |