fix 行政逻辑
Done
Merge branch 'alpha0.4'