 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 |
|
Leufolium
|
87f088aeaa
|
by Robin at 20240122; fix
|
2024-01-22 15:10:51 +08:00 |
|
Leufolium
|
851e62264f
|
by Robin at 20240122; fix
|
2024-01-22 14:21:13 +08:00 |
|
lwl0608
|
d26081c0e3
|
err
|
2024-01-21 12:48:17 +08:00 |
|
lwl0608
|
f3a9c15507
|
coinorder
|
2024-01-21 12:45:20 +08:00 |
|
lwl0608
|
7f352fd00d
|
keyword
|
2024-01-21 12:37:46 +08:00 |
|
lwl0608
|
d1884ced69
|
add ret
|
2024-01-21 12:28:09 +08:00 |
|
lwl0608
|
e3abdff08c
|
opt
|
2024-01-21 12:27:34 +08:00 |
|
Leufolium
|
9430918b7b
|
by Robin at 20240120; fix
|
2024-01-20 18:48:38 +08:00 |
|
Leufolium
|
a52ac4dfa7
|
by Robin at 20240120;l fix
|
2024-01-20 06:33:10 +08:00 |
|
chenhao
|
6d51dcf696
|
Merge pull request 'by Robin at 20240120; fix' (#63) from feat-20230112-001-Robin into test
Reviewed-on: #63
|
2024-01-20 00:54:34 +08:00 |
|
Leufolium
|
e7da8609c8
|
by Robin at 20240120; fix
|
2024-01-20 00:53:31 +08:00 |
|
chenhao
|
75873b7c44
|
Merge pull request 'feat-20240119-001-Robin' (#61) from feat-20240119-001-Robin into test
Reviewed-on: #61
|
2024-01-19 17:56:39 +08:00 |
|
Leufolium
|
b14fd35846
|
by Robin at 20240119; fix
|
2024-01-19 17:56:17 +08:00 |
|
Leufolium
|
04b65a72d2
|
by Robin at 20240119; fix
|
2024-01-19 17:31:38 +08:00 |
|
chenhao
|
b38f89228d
|
Merge pull request 'By Robin at 20240119; fix' (#60) from feat-20230112-001-Robin into test
Reviewed-on: #60
|
2024-01-19 00:31:56 +08:00 |
|
Leufolium
|
876ec6513f
|
By Robin at 20240119; fix
|
2024-01-19 00:31:03 +08:00 |
|
Leufolium
|
1602de1156
|
by Robin at 20240118;
|
2024-01-18 18:19:31 +08:00 |
|
lwl0608
|
7fff48036d
|
op coin_order_list
|
2024-01-17 22:11:12 +08:00 |
|
lwl0608
|
c6085f42d6
|
op order_list
|
2024-01-17 21:57:45 +08:00 |
|
Leufolium
|
19953dddb3
|
by
|
2024-01-17 19:53:17 +08:00 |
|
Leufolium
|
75b8d47ba9
|
by Robin at 20240117; xxl-job
|
2024-01-17 19:52:54 +08:00 |
|
chenhao
|
9d30b82e70
|
Merge pull request 'by Robin at 20240117; fix' (#59) from feat-20230112-001-Robin into test
Reviewed-on: #59
|
2024-01-17 19:19:01 +08:00 |
|
Leufolium
|
c5f5eb661c
|
by Robin at 20240117; fix
|
2024-01-17 19:18:23 +08:00 |
|
chenhao
|
8958e679f1
|
Merge pull request 'feat-20230112-001-Robin' (#57) from feat-20230112-001-Robin into test
Reviewed-on: #57
|
2024-01-13 00:32:56 +08:00 |
|
Leufolium
|
26c55749a0
|
by Robin at 20240113; moment
|
2024-01-13 00:32:19 +08:00 |