add getUserList getShopList
Merge remote-tracking branch 'choose_remote_name/master'
add member.jsp
set charset
Merge remote-tracking branch 'choose_remote_name/master'