Commit Graph

1214 Commits

Author SHA1 Message Date
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 5a4ecf01fe Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#101) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #101
2024-02-05 19:11:08 +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
chenhao d0547ecaf8 Merge pull request 'conflict-test-feat-IRONFANS-40' (#97) from conflict-test-feat-IRONFANS-40 into test
Reviewed-on: #97
2024-02-05 18:57:36 +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
chenhao ed1eb7b461 Merge pull request 'feat-IRONFANS-40-20240125-Robin' (#96) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #96
2024-02-05 18:52:28 +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
lwl0608 87ece44a9a wechat 2024-02-05 01:15:29 +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 332bcc87fc wx 2024-02-03 17:58:40 +08:00
lwl0608 9aff51c92b fix 2024-02-03 17:27:10 +08:00
lwl0608 d4011adb92 deal_one_order 2024-02-03 17:23:08 +08:00
chenhao 61c37e2f6b Merge pull request 'by Robin at 20240202; remove ad audit' (#89) from feat-20240117-001-Robin into test
Reviewed-on: #89
2024-02-02 08:04:24 +08:00
Leufolium c183b13022 by Robin at 20240202; remove ad audit 2024-02-02 08:03:40 +08:00
chenhao fe9a592d5f Merge pull request 'conflict-test-feat-20240117-001' (#88) from conflict-test-feat-20240117-001 into test
Reviewed-on: #88
2024-02-02 07:44:18 +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
chenhao bb79b70020 Merge pull request 'conflict-test-feat-IRONFANS-46' (#85) from conflict-test-feat-IRONFANS-46 into test
Reviewed-on: #85
2024-02-01 10:54:01 +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 13ec1265e3 Merge pull request 'by Robin at 20240127; fix op delete' (#82) from feat-IRONFANS-40-20240125-Robin into main
Reviewed-on: #82
2024-01-27 02:08:46 +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 a1bae6eb21 Merge pull request 'by Robin at 20240116; fix' (#78) from feat-20230116-001-Robin into main
Reviewed-on: #78
2024-01-25 08:42:43 +08:00