Commit Graph

874 Commits

Author SHA1 Message Date
chenhao 402b991583 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#350) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/350
2024-04-26 11:22:33 +08:00
Leufolium 4137710945 by Robin at 20240426 2024-04-26 11:13:49 +08:00
Leufolium 3076813dfb by Robin at 20240426; rollback create times of deleted zone moment 2024-04-26 10:48:57 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 30f4a9dd37 fix membership change 2024-04-26 02:27:07 +08:00
lwl0608 f80bfb3ab5 fix 2024-04-26 01:30:40 +08:00
lwl0608 60dd9b28c5 add wxpay callback manul 2024-04-26 01:29:36 +08:00
lwl0608 0f96f44c3e fix 2024-04-26 01:13:35 +08:00
chenhao 4b9a5327d0 Merge pull request 'feat-IRONFANS-70' (#349) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/349
2024-04-25 20:31:13 +08:00
chenhao ccf590ebe2 Merge pull request 'by Robin at 20240425' (#347) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/347
2024-04-25 20:18:38 +08:00
Leufolium eac26caaf7 by Robin at 20240425 2024-04-25 20:18:23 +08:00
chenhao dbcf924eda Merge pull request 'by Robin at 20240425' (#345) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/345
2024-04-25 20:16:15 +08:00
Leufolium 0429bbdf57 by Robin at 20240425 2024-04-25 20:15:48 +08:00
lwl0608 b47afa4909 fix 2024-04-25 19:19:22 +08:00
chenhao b75e80c928 Merge pull request 'by Robin at 20240425' (#343) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/343
2024-04-25 18:44:57 +08:00
Leufolium 5fd92b9716 by Robin at 20240425 2024-04-25 18:44:35 +08:00
lwl0608 6a6781e9d8 fix income stype 2024-04-25 18:43:38 +08:00
chenhao b038ef5896 Merge pull request 'by Robin at 20240425' (#341) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/341
2024-04-25 18:31:52 +08:00
Leufolium 4ffcf0a6a6 by Robin at 20240425 2024-04-25 18:31:34 +08:00
chenhao cd7eb88088 Merge pull request 'by Robin at 20240425' (#339) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/339
2024-04-25 18:27:08 +08:00
Leufolium 50599bbe49 by Robin at 20240425 2024-04-25 18:25:52 +08:00
chenhao 1692ee7360 Merge pull request 'by Robin at 20240425' (#337) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/337
2024-04-25 18:11:37 +08:00
Leufolium a83558e581 by Robin at 20240425 2024-04-25 18:11:16 +08:00
chenhao f7ae3aa297 Merge pull request 'by Robin at 20240425' (#335) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/335
2024-04-25 17:53:35 +08:00
Leufolium 7a9f955262 by Robin at 20240425 2024-04-25 17:53:14 +08:00
lwl0608 6dca251071 fix income stype 2024-04-25 17:48:52 +08:00
chenhao 2890f1e498 Merge pull request 'by Robin at 20240425' (#333) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/333
2024-04-25 17:21:01 +08:00
Leufolium 8f574d73fb by Robin at 20240425 2024-04-25 17:20:35 +08:00
lwl0608 88b4c917c6 fix calc 2024-04-25 16:44:50 +08:00
chenhao 0d6b0bce10 Merge pull request 'by Robin at 20240425' (#331) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/331
2024-04-25 16:41:01 +08:00
Leufolium 197fb8e87e by Robin at 20240425 2024-04-25 16:40:21 +08:00
lwl0608 e4bc45739a add sql 2024-04-25 16:10:56 +08:00
lwl0608 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +08:00
chenhao b74f7540b8 Merge pull request 'by Robin at 20240425' (#329) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/329
2024-04-25 10:02:33 +08:00
Leufolium 3fef23d3c3 by Robin at 20240425 2024-04-25 10:01:34 +08:00
lwl0608 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 327a38177f fix 2024-04-24 22:24:51 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +08:00
chenhao 2a84d99b65 Merge pull request 'by Robin at 20240424' (#327) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/327
2024-04-24 20:17:18 +08:00
Leufolium 5d7220246e by Robin at 20240424 2024-04-24 20:16:22 +08:00
lwl0608 f4dd7158e1 add incomlist log 2024-04-24 19:36:01 +08:00
lwl0608 6e83930c9e fix 2024-04-23 19:08:45 +08:00