chore: resolve conflict when sync master to develop#591

Merged

unclezoro merged 20 commits intobnb-chain:developfrom alexgao001:resolve-conflict

Mar 14, 2024

+454-204

Commits on Feb 21, 2024

Merge pull request bnb-chain#578 from bnb-chain/develop
alexgao001
authored

Commits on Feb 27, 2024

feat: an authorized account can delete object regardless object status
alexgao001
committed

Commits on Feb 29, 2024

whitelist permission
alexgao001
committed

Commits on Mar 5, 2024

Merge pull request bnb-chain#579 from alexgao001/delete-created-object-permission
alexgao001
authored

Commits on Mar 8, 2024

Commits on Mar 11, 2024

Commits on Mar 13, 2024

Commits on Mar 14, 2024

resolve conflict merge to develop
alexgao001
committed