Merge branch 'wjc_new' into wxw_new

mac

2024-05-22 78f8167844484f8601ac6f4dad84a3eb5097a2fd

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'