edit resource
Merge branch 'master' of github.com:elan2wang/UAA
user_list edit
Merge branch 'master' of github.com:elan2wang/UAA
0117-19：5