Merge branch 'wjc_new' into develop_new

mac

2024-05-30 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f

1
2
3
4
5
6
7
8
9
10
11
12
/build 
*.idea 
/.idea/libraries 
/.idea/modules 
/.idea/compiler.xml 
/.idea/gradle.xml 
/.idea/jarRepositories.xml 
/.idea/misc.xml 
/.idea/modules.xml 
/.idea/vcs.xml 
/.idea/workspace.xml 
/release