add
Merge branch 'master' of https://github.com/mz121star/wxprintadmin

Conflicts:
	Home/Tpl/Printer/modprinter.html