ignore proxool
Merge branch 'master' of https://github.com/qubin/ERP.git
处理jquery冲突