Merge branch 'wjc_new' into wxw_new

mac

2024-05-30 b6e0ba5d2b447fbb46ea03ef2a2424628f9ea66e

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'