Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -88,7 +88,6 @@
     <select id="userList" resultType="com.gree.mall.manager.bean.listvo.UserVO">
         select
         ${ex.selected},
-        b.websit_id,
         c.name as 'websit_name',
         d.nick_name as 'slaveWorkerName'
         from user a