 chenhao
|
9436053275
|
Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
|
2024-04-18 05:59:58 +08:00 |
|
Leufolium
|
4fc3732b94
|
by Robin at 20240418
|
2024-04-18 05:59:11 +08:00 |
 lwl0608
|
03fdc98f3d
|
修复
|
2024-04-16 21:13:26 +08:00 |
|
lwl0608
|
5dedd4fd27
|
fix db
|
2024-04-16 20:20:53 +08:00 |
|
Leufolium
|
50ef95271c
|
by Robin at 20240416
|
2024-04-16 19:48:15 +08:00 |
|
Leufolium
|
5cd1cbf027
|
by Robin at 20240416
|
2024-04-16 19:10:04 +08:00 |
|
lwl0608
|
9fdbd5bcb2
|
add
|
2024-04-16 10:49:02 +08:00 |
|
lwl0608
|
5c01857d28
|
add
|
2024-04-16 09:51:39 +08:00 |
|
Leufolium
|
da6d60020c
|
by Robin at 20240416
|
2024-04-16 07:41:52 +08:00 |
|
lwl0608
|
eb3d14199e
|
vas
|
2024-04-15 15:17:30 +08:00 |
|
chenhao
|
4e99c4fe82
|
Merge pull request 'b' (#284) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/284
|
2024-04-12 06:46:07 +08:00 |
|
Leufolium
|
156cc92de9
|
b
|
2024-04-12 06:45:51 +08:00 |
|
Leufolium
|
648a860a83
|
Merge branch 'dev-feat-IRONFANS-70-Robin' into conflict-feat-IRONFANS-70
|
2024-04-12 06:43:00 +08:00 |
|
Leufolium
|
52624ac592
|
by Robin at 20240411
|
2024-04-12 06:40:30 +08:00 |
|
chenhao
|
c420f41c05
|
Merge pull request 'by Robin at 20240411' (#277) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/277
|
2024-04-11 21:57:03 +08:00 |
|
Leufolium
|
1ecae673f6
|
by Robin at 20240411
|
2024-04-11 21:56:48 +08:00 |
|
chenhao
|
127c289735
|
Merge pull request 'by Robin at 20240411' (#267) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/267
|
2024-04-11 19:35:10 +08:00 |
|
Leufolium
|
c89082aea9
|
by Robin at 20240411
|
2024-04-11 19:34:51 +08:00 |
|
chenhao
|
469c7f8775
|
Merge pull request 'by Robin at 20240411' (#263) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/263
|
2024-04-11 18:19:55 +08:00 |
|
Leufolium
|
776e50f148
|
by Robin at 20240411
|
2024-04-11 18:19:34 +08:00 |
|
lwl0608
|
8f24732eb4
|
udpate proto
|
2024-04-11 17:57:01 +08:00 |
|
lwl0608
|
aff4682096
|
fix proto
|
2024-04-11 17:51:41 +08:00 |
|
lwl0608
|
1aa8641cd2
|
protos
|
2024-04-11 17:47:24 +08:00 |
|
Leufolium
|
0dd9eb1360
|
by Robin at 20240411
|
2024-04-11 16:52:30 +08:00 |
|
Leufolium
|
0975288b86
|
by Robin at 20240411
|
2024-04-11 15:46:01 +08:00 |
|
Leufolium
|
da1aa0ebd7
|
by Robin at 20240411
|
2024-04-11 00:25:06 +08:00 |
|
Leufolium
|
f96a04614a
|
by Robin at 20240409
|
2024-04-09 19:19:16 +08:00 |
|
Leufolium
|
8927d22bba
|
by Robin at 20240408
|
2024-04-08 20:05:13 +08:00 |
|
Leufolium
|
8b3d7a96cb
|
by Robin at 20240404
|
2024-04-04 21:25:13 +08:00 |
|
Leufolium
|
2400311048
|
by Robin at 20240404
|
2024-04-04 21:03:32 +08:00 |
|
Leufolium
|
4820bd9503
|
by Robin at 20240404
|
2024-04-04 20:48:42 +08:00 |
|
Leufolium
|
6a043dbbb7
|
by Robin at 20240403
|
2024-04-03 06:19:11 +08:00 |
|
Leufolium
|
ea6eea1ccf
|
by Robin at 20240403
|
2024-04-03 00:25:14 +08:00 |
|
Leufolium
|
15bb43afdf
|
by Robin at 20240402
|
2024-04-02 22:47:41 +08:00 |
|
Leufolium
|
a69bcdb6a2
|
Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin
|
2024-04-01 11:19:10 +08:00 |
|
Leufolium
|
dc65d4f32e
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70
|
2024-04-01 11:18:03 +08:00 |
|
Leufolium
|
8cc83fc70c
|
by Robin at 20240329
|
2024-03-29 22:55:58 +08:00 |
|
Leufolium
|
12549d2de5
|
by Robin at 20240329; alter moment audit procedure
|
2024-03-29 00:16:42 +08:00 |
|
Leufolium
|
5344a54888
|
Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict
|
2024-03-22 13:54:11 +08:00 |
|
Leufolium
|
407292fe8d
|
by Robin at 20240321
|
2024-03-21 23:26:23 +08:00 |
|
lwl0608
|
6d73c70cf7
|
op order list
|
2024-03-21 16:02:41 +08:00 |
|
Leufolium
|
a364553c0c
|
by Robin at 20240320
|
2024-03-20 10:06:26 +08:00 |
|
lwl0608
|
fca64cbb67
|
refund coin order
|
2024-03-19 16:04:36 +08:00 |
|
Leufolium
|
37c3929e9d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict
|
2024-03-19 00:01:43 +08:00 |
|
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
|
a2f70a63d9
|
by Robin at 20240314; add newly-created moment
|
2024-03-14 07:53:25 +08:00 |
|
lwl0608
|
b833ecdc9e
|
refund
|
2024-03-13 20:35:18 +08:00 |
|
Leufolium
|
81916b58bb
|
by Robin at 20240312; apply
|
2024-03-12 12:06:45 +08:00 |
|
Leufolium
|
43138ec16d
|
by Robin at 20240308; moment recomm
|
2024-03-08 21:14:40 +08:00 |
|
Leufolium
|
7dec418bfa
|
by Robin at 20240308
|
2024-03-08 00:42:42 +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
|
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
|
b728ab5e48
|
by Robin at 20240229; fix
|
2024-02-29 11:20:25 +08:00 |
|
Leufolium
|
b2c8a76e37
|
by Robin at 20240229; add robot
|
2024-02-29 09:55:56 +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
|
48d058610d
|
add wxpayh5
|
2024-02-26 19:28:03 +08:00 |
|
Leufolium
|
f3f3c7633e
|
by Robin at 20240223
|
2024-02-23 20:48:51 +08:00 |
|
Leufolium
|
86be2a9a84
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-22 22:31:20 +08:00 |
|
Leufolium
|
cd07846804
|
by Robin at 20240222; fix
|
2024-02-22 21:50:34 +08:00 |
|
Leufolium
|
7e967887d9
|
by Robin at 20240222; add mobile phone get
|
2024-02-22 15:20:26 +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 |
|
Leufolium
|
cffaa2c880
|
by Robin at 20240207; fix error
|
2024-02-07 14:39:18 +08:00 |
|
Leufolium
|
a1bb6f4a01
|
by Robin at 20240207
|
2024-02-07 14:06:05 +08:00 |
|
Leufolium
|
5079d25bb3
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-07 13:51:00 +08:00 |
|
Leufolium
|
12870ef2fd
|
by Robin at 20240207; add aligned
|
2024-02-07 12:07:28 +08:00 |
|
lwl0608
|
ccf4417659
|
Merge branch 'dev-lwl/wechat'
|
2024-02-05 23:25:47 +08:00 |
|
lwl0608
|
2793229b6c
|
fix
|
2024-02-05 22:06:28 +08:00 |
|
Leufolium
|
eeccbf6315
|
Merge branch 'feat-IRONFANS-53-20240205-Robin' into feat-20240117-001-Robin
|
2024-02-05 21:26:22 +08:00 |
|
lwl0608
|
2261c021fa
|
add config
|
2024-02-05 21:16:49 +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 |
|
lwl0608
|
332bcc87fc
|
wx
|
2024-02-03 17:58:40 +08:00 |
|
lwl0608
|
d4011adb92
|
deal_one_order
|
2024-02-03 17:23:08 +08:00 |
|
Leufolium
|
b3809eddf5
|
Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin
|
2024-02-01 20:10:02 +08:00 |
|
Leufolium
|
2a60148d49
|
by Robin at 20240201;
|
2024-02-01 11:07:38 +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
|
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 |
|
Leufolium
|
9c42b763d8
|
by Robin at 20240122
|
2024-01-22 17:15:59 +08:00 |
|
Leufolium
|
851e62264f
|
by Robin at 20240122; fix
|
2024-01-22 14:21:13 +08:00 |
|
lwl0608
|
e3abdff08c
|
opt
|
2024-01-21 12:27:34 +08:00 |
|
Leufolium
|
04b65a72d2
|
by Robin at 20240119; fix
|
2024-01-19 17:31:38 +08:00 |
|
Leufolium
|
876ec6513f
|
By Robin at 20240119; fix
|
2024-01-19 00:31:03 +08:00 |
|
lwl0608
|
c6085f42d6
|
op order_list
|
2024-01-17 21:57:45 +08:00 |
|
Leufolium
|
c5f5eb661c
|
by Robin at 20240117; fix
|
2024-01-17 19:18:23 +08:00 |
|
Leufolium
|
26c55749a0
|
by Robin at 20240113; moment
|
2024-01-13 00:32:19 +08:00 |
|
Leufolium
|
1f6a083f93
|
by Robin at 20240110; login add inviter field
|
2024-01-10 23:19:34 +08:00 |
|
lwl0608
|
537ed90d65
|
withdraw apply
|
2024-01-08 11:49:16 +08:00 |
|
lwl0608
|
4c6125177b
|
add
|
2024-01-07 23:02:25 +08:00 |
|
lwl0608
|
9f2b80566e
|
add
|
2024-01-07 22:37:06 +08:00 |
|
lwl0608
|
ac91201240
|
add
|
2024-01-04 18:10:26 +08:00 |
|
chenhao
|
bb8a2acd6a
|
Merge pull request 'feat-20230102-001-Robin' (#41) from feat-20230102-001-Robin into main
Reviewed-on: #41
|
2024-01-04 13:09:50 +08:00 |
|
Leufolium
|
3cc042ba66
|
by Robin at 20230103; add daily statement
|
2024-01-03 16:16:41 +08:00 |
|
chenhao
|
b1b4fed922
|
Merge pull request 'feat-20231228-001-Robin' (#36) from feat-20231228-001-Robin into main
Reviewed-on: #36
|
2024-01-02 22:41:44 +08:00 |
|
Leufolium
|
db6670572e
|
by Robin at 20230102; account count
|
2024-01-02 19:34:05 +08:00 |
|
Leufolium
|
073ebfe814
|
by Robin at 20240102
|
2024-01-02 17:49:41 +08:00 |
|
Leufolium
|
c11180094e
|
by Robin at 20231231;fix single query
|
2023-12-31 13:41:46 +08:00 |