Merge branch 'wjc_new' into develop_new

mac

2024-05-22 e5068e0a3b20b579bd62a142f9af8f5ecaa54472

1
2
3
4
5
6
7
rootProject.name = "PhotovoltaicDebug"
include ':app'
include ':third-zxing'
include ':countrypicker'
include ':aa_chart_core'
include ':pickerview'
include ':wheelview'