Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

昨天 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

1
2
3
4
5
6
7
8
9
10
11
12
13
root = true
 
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
 
[*.{java,xml,yml,yaml,md,properties,sql,js,ts,vue,html,css,scss,json}]
charset = utf-8
 
[*.md]
trim_trailing_whitespace = false