Merge branch '648540858:wvp-28181-2.0' into develop

xiaoQQya

2023-11-01 941b9a8374c2e148795d0a41c164026aca3345d2

1
2
3
4
5
6
7
8
9
root = true
 
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true