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

jyy

2021-03-17 301d10c88b03bc7993c64c3467b1bcb0b48104ea

 zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml

@@ -36,7 +36,7 @@
   </resultMap>

   <select id="selectUserByZaqns" resultMap="com.matrix.system.common.dao.SysUsersDao.SysUsersMap" >
       select su_id,su_name from sys_users where  FIND_IN_SET(#{zans}, su_id)
       select su_id,su_name from sys_users where  FIND_IN_SET(su_id,#{zans})
   </select>
   
   <!-- 定义SysFollowup 的简单map  ，本map不添加其他的关联属性 -->