Merge branch 'master' into 'developer'

# Conflicts:
#   haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java