 Leufolium
|
6dc26aeb1b
|
Merge remote-tracking branch 'origin/main' into test
|
2024-05-20 15:31:38 +08:00 |
|
Leufolium
|
f7c25ae1cc
|
Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into release-20240517
|
2024-05-17 16:12:41 +08:00 |
|
chenhao
|
f8775c6d17
|
Merge pull request 'feat-IRONFANS-112-Robin' (#448) from feat-IRONFANS-112-Robin into release-20240517
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/448
|
2024-05-17 16:10:50 +08:00 |
 lwl0608
|
16713c569f
|
Merge branch 'dev-lwl/order'
|
2024-05-17 14:08:57 +08:00 |
|
lwl0608
|
e9f21d42d7
|
Merge branch 'dev-lwl/consul' into test
|
2024-05-17 10:59:56 +08:00 |
|
lwl0608
|
0598f99bd3
|
fix
|
2024-05-17 10:59:40 +08:00 |
|
lwl0608
|
930e39e500
|
Merge branch 'dev-lwl/consul' into test
|
2024-05-17 10:44:54 +08:00 |
|
lwl0608
|
38eebe5b35
|
fix
|
2024-05-17 10:44:48 +08:00 |
|
lwl0608
|
61f06ac60d
|
fix
|
2024-05-16 23:49:13 +08:00 |
|
lwl0608
|
6a975818f7
|
merge
|
2024-05-16 21:08:42 +08:00 |
|
lwl0608
|
ae822fd49c
|
consul
|
2024-05-16 20:43:21 +08:00 |
|
lwl0608
|
65152f30a7
|
add
|
2024-05-16 19:59:10 +08:00 |
|
Leufolium
|
757ca5edc6
|
Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf
|
2024-05-15 16:32:37 +08:00 |
|
lwl0608
|
698ad85bf0
|
fix
|
2024-05-15 14:22:54 +08:00 |
|
lwl0608
|
534fe16e05
|
fix
|
2024-05-15 14:21:01 +08:00 |
|
lwl0608
|
b6e45575ff
|
merge
|
2024-05-15 10:22:18 +08:00 |
|
lwl0608
|
936929b0ec
|
fix moment_order_list
|
2024-05-15 10:21:18 +08:00 |
|
Leufolium
|
7107bb0393
|
by Robin at 20240515
|
2024-05-15 09:58:45 +08:00 |
|
lwl0608
|
961f37af1b
|
fix
|
2024-05-14 10:58:07 +08:00 |
|
lwl0608
|
4bf3a744b3
|
本周迭代
|
2024-05-14 10:55:49 +08:00 |
|
chenhao
|
ea48594fc9
|
Merge pull request 'by Robin at 20240510' (#425) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/425
|
2024-05-10 22:36:30 +08:00 |
|
Leufolium
|
77efdcc607
|
by Robin at 20240510
|
2024-05-10 22:35:27 +08:00 |
|
Leufolium
|
ec8e81a745
|
Merge remote-tracking branch 'origin/feat-IRONFANS-114-Robin' into conflict
|
2024-05-09 17:28:37 +08:00 |
|
Leufolium
|
67851d0dae
|
by Robin at 20240509
|
2024-05-09 17:24:56 +08:00 |
|
chenhao
|
03b00506dc
|
Merge pull request 'by Robin at 20240507; set is_hided for zone third partner' (#406) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/406
|
2024-05-07 16:59:29 +08:00 |
|
Leufolium
|
7b385f395d
|
by Robin at 20240507; set is_hided for zone third partner
|
2024-05-07 16:59:10 +08:00 |
|
lwl0608
|
f247f2ddc1
|
merge
|
2024-05-07 10:51:11 +08:00 |
|
lwl0608
|
5aab80fcdd
|
add media op
|
2024-05-07 10:50:40 +08:00 |
|
lwl0608
|
3c3c849213
|
Merge branch 'dev-lwl/fix' into test
|
2024-05-03 19:39:38 +08:00 |
|
lwl0608
|
affc815e8e
|
fix is_moment_image_encrypt_enabled
|
2024-05-03 19:39:29 +08:00 |
|
chenhao
|
a0dac18ede
|
Merge pull request 'feat-IRONFANS-70' (#395) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/395
|
2024-05-01 03:28:28 +08:00 |
|
Leufolium
|
d494eb921b
|
by Robin at 20240501
|
2024-05-01 02:51:47 +08:00 |
|
Leufolium
|
d642ca7dc0
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70
|
2024-05-01 01:11:00 +08:00 |
|
Leufolium
|
7e71e670c0
|
Merge branch 'feat-IRONFANS-70' into conflict
|
2024-04-30 09:52:51 +08:00 |
|
Leufolium
|
1ac73882d1
|
by Robin at 20240430
|
2024-04-30 09:51:23 +08:00 |
|
chenhao
|
b0fc62679e
|
Merge pull request 'by Robin at 20240430' (#385) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/385
|
2024-04-30 09:23:24 +08:00 |
|
Leufolium
|
7f18d00df4
|
by Robin at 20240430
|
2024-04-30 09:22:18 +08:00 |
|
chenhao
|
9c893d4a9c
|
Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
|
2024-04-29 22:20:05 +08:00 |
|
lwl0608
|
3dc8a84b7c
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-29 17:39:59 +08:00 |
|
lwl0608
|
715ff91c51
|
zone_refund_list
|
2024-04-29 17:39:49 +08:00 |
|
lwl0608
|
53bfdfe33c
|
Merge branch 'dev-lwl/zone' into test
|
2024-04-28 18:00:17 +08:00 |
|
lwl0608
|
8db2ce1071
|
fix
|
2024-04-28 17:59:57 +08:00 |
|
chenhao
|
0c86d4db01
|
Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
|
2024-04-27 11:17:19 +08:00 |
|
Leufolium
|
b53a96d3bf
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin
|
2024-04-27 08:27:34 +08:00 |
|
chenhao
|
79df3e410e
|
Merge pull request 'feat-IRONFANS-70' (#360) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/360
|
2024-04-27 00:48:29 +08:00 |
|
chenhao
|
3908f40305
|
Merge pull request 'by Robin at 20240426' (#353) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/353
|
2024-04-26 14:55:18 +08:00 |
|
chenhao
|
c922628f5a
|
Merge pull request 'main' (#352) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/352
|
2024-04-26 14:55:04 +08:00 |
|
Leufolium
|
2ac68c47c7
|
by Robin at 20240426
|
2024-04-26 14:54:27 +08:00 |
|
Leufolium
|
0630bd9a18
|
by Robin at 20240426
|
2024-04-26 10:46:37 +08:00 |
|
lwl0608
|
f80bfb3ab5
|
fix
|
2024-04-26 01:30:40 +08:00 |