Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712

648540858

2022-07-12 66e67569095f0ba871c2b584ceed73dfaa50d00c

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