Merge branch 'dev_jm_user' of http://47.122.114.111:9999/chehuidong/saas-manage into dev_customer_follow
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.