chenhao
|
6bda0929d9
|
Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
|
2024-03-18 23:51:52 +08:00 |
Leufolium
|
d2f961a2d4
|
1
|
2024-03-18 23:51:31 +08:00 |
Leufolium
|
5ca57d639f
|
ret
|
2024-03-17 00:32:47 +08:00 |
Leufolium
|
8c82c59384
|
1
|
2024-03-17 00:31:02 +08:00 |
Leufolium
|
f2c294b379
|
1
|
2024-03-17 00:25:37 +08:00 |
Leufolium
|
67e27e04db
|
Merge branch 'BUG-20240316-0001-Robin' into conflict
|
2024-03-16 22:36:05 +08:00 |
Leufolium
|
89c8c5565b
|
by Robin at 20240316; alter account search expr
|
2024-03-16 22:33:58 +08:00 |
chenhao
|
3bd1639124
|
Merge pull request 'by Robin at 20240315' (#181) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/181
|
2024-03-15 21:18:40 +08:00 |
Leufolium
|
5ccad2cbca
|
by Robin at 20240315
|
2024-03-15 21:18:11 +08:00 |
chenhao
|
cf34472eb5
|
Merge pull request 'by Robin at 20240315; alter upper bound' (#180) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/180
|
2024-03-15 21:14:51 +08:00 |
Leufolium
|
a10ce673ec
|
by Robin at 20240315; alter upper bound
|
2024-03-15 21:13:57 +08:00 |
Leufolium
|
b8dc1a7a1b
|
Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict
|
2024-03-15 00:45:38 +08:00 |
Leufolium
|
1954e80ab3
|
Merge branch 'feat-IRONFANS-58-Robin' into conflict
|
2024-03-14 07:55:43 +08:00 |
Leufolium
|
a2f70a63d9
|
by Robin at 20240314; add newly-created moment
|
2024-03-14 07:53:25 +08:00 |
lwl0608
|
7b4954bbf8
|
fix streamer id
|
2024-03-13 21:06:00 +08:00 |
lwl0608
|
371cf04c5f
|
ch log
|
2024-03-13 20:51:29 +08:00 |
lwl0608
|
9e1a95bfe3
|
refund
|
2024-03-13 20:38:03 +08:00 |
lwl0608
|
779e47996e
|
Merge branch 'dev-lwl/refund'
|
2024-03-13 20:35:32 +08:00 |
lwl0608
|
b833ecdc9e
|
refund
|
2024-03-13 20:35:18 +08:00 |
chenhao
|
4711e9e2e4
|
Merge pull request 'by Robin at 20240313; alter msg for permanent block' (#175) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/175
|
2024-03-13 16:32:42 +08:00 |
Leufolium
|
3d0dbb6ca2
|
by Robin at 20240313; alter msg for permanent block
|
2024-03-13 16:31:51 +08:00 |
chenhao
|
5881859273
|
Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
|
2024-03-12 23:49:14 +08:00 |
Leufolium
|
f990dd0be0
|
Merge branch 'feat-IRONFANS-66-Robin' into conflict
|
2024-03-12 12:10:16 +08:00 |
Leufolium
|
81916b58bb
|
by Robin at 20240312; apply
|
2024-03-12 12:06:45 +08:00 |
chenhao
|
0c3499f6a9
|
Merge pull request 'feat-IRONFANS-58-Robin' (#171) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/171
|
2024-03-08 23:03:50 +08:00 |
Leufolium
|
d93e59e24f
|
by Robin at 20240308; moment list by ids add follow
|
2024-03-08 23:03:20 +08:00 |
Leufolium
|
7497d4afe5
|
by Robin at 20240308; remove log
|
2024-03-08 22:46:49 +08:00 |
chenhao
|
758dc0ef66
|
Merge pull request 'by Robin at 20240308' (#170) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/170
|
2024-03-08 22:37:15 +08:00 |
Leufolium
|
db9d6b2b0b
|
by Robin at 20240308
|
2024-03-08 22:36:16 +08:00 |
Leufolium
|
4cf49ad204
|
Merge branch 'feat-IRONFANS-58-Robin' into conflict
|
2024-03-08 21:21:20 +08:00 |
Leufolium
|
43138ec16d
|
by Robin at 20240308; moment recomm
|
2024-03-08 21:14:40 +08:00 |
chenhao
|
b173c28626
|
Merge pull request 'by Robin at 20240308,up op refreshes bottom flag' (#167) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/167
|
2024-03-08 15:43:54 +08:00 |
Leufolium
|
30bcd59226
|
by Robin at 20240308,up op refreshes bottom flag
|
2024-03-08 15:43:15 +08:00 |
chenhao
|
11ddcd1c93
|
Merge pull request 'feat-IRONFANS-58-Robin' (#166) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/166
|
2024-03-08 15:22:51 +08:00 |
Leufolium
|
5f253ab9d3
|
fix
|
2024-03-08 15:22:33 +08:00 |
Leufolium
|
81d0858aad
|
by
|
2024-03-08 15:21:52 +08:00 |
chenhao
|
2c7ffb40c9
|
Merge pull request 'by Robin at 20240308; add bottom flag' (#165) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/165
|
2024-03-08 15:15:49 +08:00 |
Leufolium
|
bed1313e84
|
by Robin at 20240308; add bottom flag
|
2024-03-08 15:15:09 +08:00 |
chenhao
|
74c6061db0
|
Merge pull request 'by Robin at 20240308; logout' (#164) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/164
|
2024-03-08 12:52:59 +08:00 |
Leufolium
|
f94f90b0e7
|
by Robin at 20240308; logout
|
2024-03-08 12:52:10 +08:00 |
chenhao
|
acd2370031
|
Merge pull request 'feat-IRONFANS-58-Robin' (#162) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/162
|
2024-03-08 01:38:50 +08:00 |
Leufolium
|
5a965d4f75
|
by Robin at 20240308
|
2024-03-08 01:38:07 +08:00 |
Leufolium
|
960adc1455
|
Merge branch 'feat-IRONFANS-58-Robin' into conflict
|
2024-03-08 01:30:30 +08:00 |
Leufolium
|
23d64b3454
|
by Robin at 20240308
|
2024-03-08 01:25:43 +08:00 |
Leufolium
|
47ef06b88f
|
by Robin at 20240308
|
2024-03-08 01:13:48 +08:00 |
Leufolium
|
9692680528
|
by
|
2024-03-08 00:59:20 +08:00 |
Leufolium
|
7dec418bfa
|
by Robin at 20240308
|
2024-03-08 00:42:42 +08:00 |
lwl0608
|
614c93f962
|
cancel token
|
2024-03-07 19:40:15 +08:00 |
lwl0608
|
3273330c76
|
refund
|
2024-03-07 19:39:33 +08:00 |
chenhao
|
dcf617df52
|
Merge pull request 'd' (#159) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/159
|
2024-03-07 01:50:04 +08:00 |
Leufolium
|
279263fd54
|
d
|
2024-03-07 01:49:37 +08:00 |
chenhao
|
365b860df3
|
Merge pull request 'feat-IRONFANS-62-Robin' (#158) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/158
|
2024-03-07 01:46:51 +08:00 |
Leufolium
|
8dfbc2326b
|
by Robin at 20240307
|
2024-03-07 01:43:30 +08:00 |
Leufolium
|
51d3e5e568
|
By Robin at 20240307
|
2024-03-07 01:18:41 +08:00 |
chenhao
|
08f457a4ba
|
Merge pull request 'feat-IRONFANS-62-Robin' (#157) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/157
|
2024-03-06 20:08:27 +08:00 |
chenhao
|
e95ca7f4f1
|
revert 5fab9ff0fd
revert By Robin at 20240304; cancel account function at mongo part
|
2024-03-05 13:21:22 +08:00 |
Leufolium
|
5fab9ff0fd
|
By Robin at 20240304; cancel account function at mongo part
|
2024-03-04 19:21:30 +08:00 |
Leufolium
|
b2b29d7466
|
by Robin at 20240302
|
2024-03-02 08:29:20 +08:00 |
chenhao
|
20a97b8ba7
|
Merge pull request 'feat-IRONFANS-61-Robin' (#154) from feat-IRONFANS-61-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/154
|
2024-02-29 11:23:45 +08:00 |
Leufolium
|
b41aad7e4e
|
1
|
2024-02-29 11:22:33 +08:00 |
Leufolium
|
b728ab5e48
|
by Robin at 20240229; fix
|
2024-02-29 11:20:25 +08:00 |
Leufolium
|
32c5541cdb
|
Merge branch 'feat-IRONFANS-61-Robin' into conflict
|
2024-02-29 10:54:09 +08:00 |
Leufolium
|
9f924901ec
|
by Robin at 20240229; fix
|
2024-02-29 10:49:54 +08:00 |
Leufolium
|
0e297f564c
|
by Robin at 20240229; fix
|
2024-02-29 10:34:21 +08:00 |
Leufolium
|
b2c8a76e37
|
by Robin at 20240229; add robot
|
2024-02-29 09:55:56 +08:00 |
chenhao
|
757739b646
|
Merge pull request 'by Robin at 20240229; fix' (#151) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/151
|
2024-02-29 02:05:33 +08:00 |
chenhao
|
e0ffa31e10
|
Merge pull request 'by Robin at 20240229; fix' (#150) from feat-20240117-001-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/150
|
2024-02-29 02:05:24 +08:00 |
Leufolium
|
eec07ab1d7
|
by Robin at 20240229; fix
|
2024-02-29 02:05:10 +08:00 |
chenhao
|
11a478825f
|
Merge pull request 'by Robin at 20240227; op moment audit task' (#147) from feat-20240117-001-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/147
|
2024-02-27 19:29:00 +08:00 |
chenhao
|
69135f732a
|
Merge pull request 'by Robin at 20240227; op moment audit task' (#146) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/146
|
2024-02-27 19:28:26 +08:00 |
Leufolium
|
4a45945c07
|
by Robin at 20240227; op moment audit task
|
2024-02-27 19:28:13 +08:00 |
chenhao
|
ac9f26eac3
|
Merge pull request 'feat-20240117-001-Robin' (#145) from feat-20240117-001-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/145
|
2024-02-27 19:19:22 +08:00 |
chenhao
|
86dfb4c6f6
|
Merge pull request 'by Robin at 20240227; when audit task is nil set its status = success' (#144) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/144
|
2024-02-27 19:19:13 +08:00 |
Leufolium
|
4458e8228c
|
by Robin at 20240227; when audit task is nil set its status = success
|
2024-02-27 19:18:52 +08:00 |
chenhao
|
ce6336ab34
|
Merge pull request 'by Robin at 20240227' (#142) from testonly-vericode_create into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/142
|
2024-02-27 02:29:47 +08:00 |
Leufolium
|
b46a911e16
|
by Robin at 20240227
|
2024-02-27 02:29:15 +08:00 |
Leufolium
|
ebfb44a78b
|
by Robin at 20240227;
|
2024-02-27 02:06:26 +08:00 |
chenhao
|
71f7764e07
|
Merge pull request 'feat-IRONFANS-56-Robin' (#140) from feat-IRONFANS-56-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/140
|
2024-02-27 01:51:28 +08:00 |
Leufolium
|
2decbe9c67
|
by Robin at 20240227; register source statistics
|
2024-02-27 01:50:47 +08:00 |
Leufolium
|
14e8ae6cd7
|
by Robin at 20240227;
|
2024-02-27 01:28:27 +08:00 |
chenhao
|
5c164795f7
|
Merge pull request 'main' (#139) from main into feat-IRONFANS-56-Robin
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/139
|
2024-02-27 01:12:54 +08:00 |
chenhao
|
4903267633
|
Merge pull request 'feat-20240117-001-Robin' (#137) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/137
|
2024-02-27 00:55:59 +08:00 |
lwl0608
|
a0cb8555ce
|
add wxpayh5
|
2024-02-26 19:29:59 +08:00 |
lwl0608
|
48d058610d
|
add wxpayh5
|
2024-02-26 19:28:03 +08:00 |
chenhao
|
0c80c91fba
|
Merge pull request 'by Robin at 20240226;' (#136) from feat-20240117-001-Robin into test
Reviewed-on: #136
|
2024-02-26 09:08:18 +08:00 |
Leufolium
|
d31a7c0ffc
|
by Robin at 20240226;
|
2024-02-26 09:07:17 +08:00 |
chenhao
|
828c3fbadd
|
Merge pull request 'feat-20240117-001-Robin' (#135) from feat-20240117-001-Robin into test
Reviewed-on: #135
|
2024-02-26 08:27:01 +08:00 |
Leufolium
|
d0017528b0
|
by Robin at 20240226;
|
2024-02-26 08:26:21 +08:00 |
Leufolium
|
6fb4fe002e
|
by Robin at 20240226;
|
2024-02-26 08:03:37 +08:00 |
lwl0608
|
0b1a71a343
|
fix
|
2024-02-26 00:50:56 +08:00 |
lwl0608
|
8b3d5b5ec6
|
体现用 心意到了账户
|
2024-02-25 23:17:17 +08:00 |
chenhao
|
e2be821d62
|
Merge pull request 'by Robin at 20240223' (#134) from feat-20240117-001-Robin into test
Reviewed-on: #134
|
2024-02-23 23:49:47 +08:00 |
Leufolium
|
3beeb4c7e6
|
by Robin at 20240223
|
2024-02-23 23:48:31 +08:00 |
chenhao
|
9051c79080
|
Merge pull request 'by Robin at 20240223' (#133) from feat-20240117-001-Robin into test
Reviewed-on: #133
|
2024-02-23 20:49:57 +08:00 |
Leufolium
|
f3f3c7633e
|
by Robin at 20240223
|
2024-02-23 20:48:51 +08:00 |
chenhao
|
a03abd2073
|
Merge pull request 'by Robin at 202240223; fix' (#132) from feat-20240117-001-Robin into test
Reviewed-on: #132
|
2024-02-23 17:22:38 +08:00 |
Leufolium
|
48d087d6df
|
by Robin at 202240223; fix
|
2024-02-23 17:20:36 +08:00 |
Leufolium
|
8cb0ab6819
|
by Robin at 20240223; fix
|
2024-02-23 16:04:54 +08:00 |
Leufolium
|
baa6256491
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-22 22:50:41 +08:00 |
Leufolium
|
86be2a9a84
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-22 22:31:20 +08:00 |
Leufolium
|
cadcb90538
|
by Robin at 20240222; fix
|
2024-02-22 22:29:21 +08:00 |
Leufolium
|
cd07846804
|
by Robin at 20240222; fix
|
2024-02-22 21:50:34 +08:00 |
chenhao
|
4cda86c8e4
|
Merge pull request 'by Robin at 20240222; add mobile phone get' (#126) from feat-IRONFANS-57-Robin into test
Reviewed-on: #126
|
2024-02-22 15:22:38 +08:00 |
Leufolium
|
7e967887d9
|
by Robin at 20240222; add mobile phone get
|
2024-02-22 15:20:26 +08:00 |
Leufolium
|
582cb27830
|
Merge branch 'feat-IRONFANS-54-Robin' into conflict
|
2024-02-22 14:39:53 +08:00 |
Leufolium
|
967d383b46
|
by Robin at 20240222; fix
|
2024-02-22 14:36:28 +08:00 |
chenhao
|
27e6c08ce4
|
Merge pull request 'by Robin at 20240221; change moment audit logic' (#123) from feat-20240117-001-Robin into test
Reviewed-on: #123
|
2024-02-21 18:05:42 +08:00 |
Leufolium
|
19de07fbe4
|
by Robin at 20240221; change moment audit logic
|
2024-02-21 18:04:01 +08:00 |
lwl0608
|
59f206a612
|
recover apply
|
2024-02-21 11:36:21 +08:00 |
lwl0608
|
98ea808079
|
add wechat auth code
|
2024-02-20 23:13:17 +08:00 |
lwl0608
|
201e1f4c5c
|
wx jsapi
|
2024-02-20 23:05:24 +08:00 |
lwl0608
|
272210b23a
|
add recover
|
2024-02-20 00:37:13 +08:00 |
lwl0608
|
8e134f4db5
|
提现维护
|
2024-02-19 23:27:36 +08:00 |
lwl0608
|
698f7ff1f2
|
fix
|
2024-02-19 21:18:12 +08:00 |
lwl0608
|
6952c1fbce
|
fix
|
2024-02-19 21:13:18 +08:00 |
lwl0608
|
da9203fe64
|
fix
|
2024-02-19 21:04:45 +08:00 |
lwl0608
|
7f38018b8c
|
打开提现
|
2024-02-19 13:07:56 +08:00 |
lwl0608
|
2a09163410
|
add oid3
|
2024-02-18 23:51:52 +08:00 |
lwl0608
|
c61abde23b
|
fff
|
2024-02-18 23:47:58 +08:00 |
lwl0608
|
ef6538528d
|
支付宝优化
|
2024-02-18 23:24:52 +08:00 |
lwl0608
|
13261a3f8d
|
add alipay ymkj
|
2024-02-12 19:41:41 +04:00 |
chenhao
|
f7a823dfd6
|
Merge pull request 'fix query audit bug' (#121) from feat-20240117-001-Robin into test
Reviewed-on: #121
|
2024-02-07 14:44:21 +08:00 |
Leufolium
|
d195f05661
|
fix query audit bug
|
2024-02-07 14:42:50 +08:00 |
Leufolium
|
8666678a6b
|
Merge branch 'feat-20240117-001-Robin' into conf-test-0117
|
2024-02-07 13:58:02 +08:00 |
Leufolium
|
d072565b80
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-07 13:52:12 +08:00 |
Leufolium
|
5079d25bb3
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-07 13:51:00 +08:00 |
chenhao
|
0b2d00d47e
|
Merge pull request '修复错误码' (#114) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #114
|
2024-02-07 13:47:58 +08:00 |
Leufolium
|
c539a93b66
|
修复错误码
|
2024-02-07 13:47:08 +08:00 |
chenhao
|
4c9c70d334
|
Merge pull request 'w' (#113) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #113
|
2024-02-07 13:07:50 +08:00 |
Leufolium
|
0e36036b11
|
w
|
2024-02-07 13:07:34 +08:00 |
chenhao
|
a4bd34e4cd
|
Merge pull request '启动定时任务' (#112) from feat-IRONFANS-53-20240205-Robin into main
Reviewed-on: #112
|
2024-02-07 12:44:03 +08:00 |
Leufolium
|
9e3d5de744
|
启动定时任务
|
2024-02-07 12:43:47 +08:00 |
chenhao
|
cc576a5228
|
Merge pull request 'by Robin at 20240207;' (#111) from feat-20240117-001-Robin into test
Reviewed-on: #111
|
2024-02-07 12:24:34 +08:00 |
Leufolium
|
22c605022d
|
by Robin at 20240207;
|
2024-02-07 12:23:27 +08:00 |
Leufolium
|
b19f4eb26d
|
Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001-Robin
|
2024-02-07 12:15:34 +08:00 |
Leufolium
|
12870ef2fd
|
by Robin at 20240207; add aligned
|
2024-02-07 12:07:28 +08:00 |
lwl0608
|
632ce1228e
|
SelectMinSizeOssId
|
2024-02-06 02:51:24 +08:00 |
lwl0608
|
ccf4417659
|
Merge branch 'dev-lwl/wechat'
|
2024-02-05 23:25:47 +08:00 |
lwl0608
|
1415b2d6ee
|
Merge branch 'dev-lwl/wechat' into test
|
2024-02-05 22:57:27 +08:00 |
lwl0608
|
02a84531e4
|
fix
|
2024-02-05 22:57:17 +08:00 |
lwl0608
|
3ed0c7bdeb
|
Merge branch 'dev-lwl/wechat' into test
|
2024-02-05 22:06:38 +08:00 |
lwl0608
|
2793229b6c
|
fix
|
2024-02-05 22:06:28 +08:00 |
chenhao
|
2a45bd9339
|
Merge pull request 'cron add clear moment create times' (#106) from feat-20240117-001-Robin into test
Reviewed-on: #106
|
2024-02-05 21:40:39 +08:00 |
Leufolium
|
bbf0492655
|
cron add clear moment create times
|
2024-02-05 21:39:29 +08:00 |
Leufolium
|
cbbf3579e4
|
Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001
|
2024-02-05 21:35:08 +08:00 |
Leufolium
|
eeccbf6315
|
Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin
|
2024-02-05 21:26:22 +08:00 |
Leufolium
|
c8d6c0bc0e
|
cron
|
2024-02-05 21:21:24 +08:00 |
chenhao
|
4627c9d2a0
|
Merge pull request 'feat-IRONFANS-53-20240205-Robin' (#102) from feat-IRONFANS-53-20240205-Robin into test
Reviewed-on: #102
|
2024-02-05 21:21:13 +08:00 |
Leufolium
|
01092097c8
|
by Robin at 20240205
|
2024-02-05 21:18:27 +08:00 |
lwl0608
|
cb718d1850
|
Merge branch 'dev-lwl/wechat' into test
|
2024-02-05 21:17:06 +08:00 |
lwl0608
|
2261c021fa
|
add config
|
2024-02-05 21:16:49 +08:00 |
chenhao
|
5392b29437
|
Merge pull request 'return info' (#100) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #100
|
2024-02-05 19:09:36 +08:00 |
Leufolium
|
87c431ce8e
|
return info
|
2024-02-05 19:09:18 +08:00 |
chenhao
|
b7648251ec
|
Merge pull request 'by Robin at 20240205' (#99) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #99
|
2024-02-05 19:06:57 +08:00 |
Leufolium
|
9178b4a5ce
|
by Robin at 20240205
|
2024-02-05 19:06:42 +08:00 |
chenhao
|
2d2877131a
|
Merge pull request 'fix null' (#98) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #98
|
2024-02-05 19:03:52 +08:00 |
Leufolium
|
242074a491
|
fix null
|
2024-02-05 19:03:35 +08:00 |
Leufolium
|
2664c50ce4
|
Merge branch 'feat-IRONFANS-40-20240125-Robin' into conflict-test-feat-IRONFANS-40
|
2024-02-05 18:55:53 +08:00 |
Leufolium
|
27e8d492cc
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-40-20240125-Robin
|
2024-02-05 18:51:18 +08:00 |
Leufolium
|
9e85281c9f
|
by Robin at 20240205; add op moment list by mid
|
2024-02-05 18:47:51 +08:00 |
chenhao
|
4346b953d6
|
Merge pull request 'feat-IRONFANS-46-20240201-Robin' (#92) from feat-IRONFANS-46-20240201-Robin into main
Reviewed-on: #92
|
2024-02-04 17:01:34 +08:00 |
chenhao
|
0d0f51902e
|
Merge pull request 'by Robin at 20240204; moment list by mid' (#91) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #91
|
2024-02-04 08:06:16 +08:00 |
chenhao
|
c7962fa4e8
|
Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#90) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #90
|
2024-02-04 08:04:44 +08:00 |
Leufolium
|
e8eabcc42e
|
by Robin at 20240204; moment list by mid
|
2024-02-04 08:04:13 +08:00 |
lwl0608
|
d4011adb92
|
deal_one_order
|
2024-02-03 17:23:08 +08:00 |
Leufolium
|
2d405a4549
|
Merge branch 'feat-20240117-001-Robin' into conflict-test-feat-20240117-001
|
2024-02-02 07:42:29 +08:00 |
Leufolium
|
91c6864787
|
by Robin at 20240201; add moment audit
|
2024-02-01 20:12:53 +08:00 |
Leufolium
|
b3809eddf5
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-01 20:10:02 +08:00 |
Leufolium
|
110043116d
|
by Robin at 20240201; add moment audit
|
2024-02-01 20:06:43 +08:00 |
Leufolium
|
a5b635b5be
|
by Robin at 20240201; fix
|
2024-02-01 19:44:07 +08:00 |
chenhao
|
1876129865
|
Merge pull request 'by Robin at 20240201;' (#86) from feat-IRONFANS-46-20240201-Robin into test
Reviewed-on: #86
|
2024-02-01 11:08:03 +08:00 |
Leufolium
|
2a60148d49
|
by Robin at 20240201;
|
2024-02-01 11:07:38 +08:00 |
Leufolium
|
4f80f4540b
|
Merge branch 'feat-IRONFANS-46-20240201-Robin' into conflict-test-feat-IRONFANS-46
|
2024-02-01 10:52:52 +08:00 |
Leufolium
|
52279af4a9
|
by Robin at 20240201;
|
2024-02-01 10:19:44 +08:00 |
Leufolium
|
c71c996afd
|
by Robin at 20240201;
|
2024-02-01 09:52:45 +08:00 |
Leufolium
|
f1ffbf473a
|
by Robin at 20240201;
|
2024-02-01 09:02:11 +08:00 |
chenhao
|
b645981428
|
Merge pull request 'by Robin at 20240127; add op list by mid account' (#83) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #83
|
2024-01-27 16:51:15 +08:00 |
Leufolium
|
9297aa8fbd
|
by Robin at 20240127; add op list by mid account
|
2024-01-27 16:50:39 +08:00 |
chenhao
|
7004bbbf78
|
Merge pull request 'by Robin at 20240127; fix op delete' (#81) from feat-IRONFANS-40-20240125-Robin into test
Reviewed-on: #81
|
2024-01-27 02:04:39 +08:00 |
Leufolium
|
20c1a9bd69
|
by Robin at 20240127; fix op delete
|
2024-01-27 02:04:17 +08:00 |
chenhao
|
9161d982a2
|
Merge pull request 'feat-IRONFANS-32-20240125-Robin' (#80) from feat-IRONFANS-32-20240125-Robin into test
Reviewed-on: #80
|
2024-01-25 09:53:37 +08:00 |
Leufolium
|
de3619efe3
|
by Robin at 20240125; get_coins_product_list not token auth
|
2024-01-25 09:50:08 +08:00 |
Leufolium
|
3e484d0e31
|
by Robin at 20240125; apipaycallback not token auth
|
2024-01-25 09:44:53 +08:00 |
chenhao
|
ad33ea365d
|
Merge pull request 'feat-IRONFANS-32-20240125-Robin' (#79) from feat-IRONFANS-32-20240125-Robin into test
Reviewed-on: #79
|
2024-01-25 09:01:56 +08:00 |
Leufolium
|
12ee83520f
|
by Robin at 20240125; add token auth
|
2024-01-25 08:59:52 +08:00 |
chenhao
|
1ce311a90e
|
Merge pull request 'by Robin at 20240123; add consume his' (#76) from feat-20240121-001-Robin into test
Reviewed-on: #76
|
2024-01-23 20:57:52 +08:00 |
Leufolium
|
68a75a8184
|
by Robin at 20240123; add consume his
|
2024-01-23 20:57:30 +08:00 |
chenhao
|
2c0855ffb0
|
Merge pull request 'feat-20240121-001-Robin' (#74) from feat-20240121-001-Robin into test
Reviewed-on: #74
|
2024-01-23 19:39:31 +08:00 |
Leufolium
|
ff9e1acf68
|
by Robin at 20240123; fix
|
2024-01-23 19:36:49 +08:00 |
Leufolium
|
48d1cb1b88
|
Merge remote-tracking branch 'origin/main' into feat-20240121-001-Robin
|
2024-01-23 19:12:27 +08:00 |
chenhao
|
af8763e8d8
|
Merge pull request 'by Robin at 20240123; return_url alteration' (#70) from feat-20240121-001-Robin into test
Reviewed-on: #70
|
2024-01-23 19:09:23 +08:00 |
Leufolium
|
9eac3af283
|
by Robin at 20240123; return_url alteration
|
2024-01-23 19:08:59 +08:00 |
Leufolium
|
e20f3c338c
|
Merge branch 'feat-20240121-001-Robin' into conflict-feat-20240112-001-main
|
2024-01-23 18:01:39 +08:00 |
chenhao
|
f724fed644
|
Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main
Reviewed-on: #67
|
2024-01-23 17:56:14 +08:00 |
chenhao
|
0f3407746e
|
Merge pull request 'by Robin at 20240123; fix' (#66) from feat-20240121-001-Robin into test
Reviewed-on: #66
|
2024-01-23 17:39:15 +08:00 |
Leufolium
|
415c71f150
|
by Robin at 20240123; fix
|
2024-01-23 17:38:28 +08:00 |
chenhao
|
b1262d838a
|
Merge pull request 'by Robin at 20240122; fix' (#65) from feat-20240121-001-Robin into test
Reviewed-on: #65
|
2024-01-22 17:17:04 +08:00 |
Leufolium
|
e1e6b253e2
|
by Robin at 20240122; fix
|
2024-01-22 15:23:19 +08:00 |
chenhao
|
75fc8d2611
|
Merge pull request 'feat-20240121-001-Robin' (#64) from feat-20240121-001-Robin into test
Reviewed-on: #64
|
2024-01-22 15:14:17 +08:00 |
Leufolium
|
f91231f5b3
|
by Robin at 20240112; fix
|
2024-01-22 15:13:52 +08:00 |