conflict #153

Merged
chenhao merged 11 commits from conflict into test 2024-02-29 10:57:49 +08:00

11 Commits

Author SHA1 Message Date
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 a1f3e5b4ff Merge pull request 'by Robin at 20240229; fix' (#149) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/149
2024-02-29 01:50:14 +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
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
chenhao 99b0837a6d Merge pull request 'feat-IRONFANS-56-Robin' (#143) from feat-IRONFANS-56-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/143
2024-02-27 18:18:17 +08:00
chenhao c2a010ff26 Merge pull request 'by Robin at 20240227;' (#141) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/141
2024-02-27 02:21:40 +08:00
Leufolium ebfb44a78b by Robin at 20240227; 2024-02-27 02:06:26 +08:00