李进 92314ec070 Merge branch 'bash_active' into test 1 anno fa
..
src 92314ec070 Merge branch 'bash_active' into test 1 anno fa
pom.xml a06391491a 设备激活 2 anni fa