Merge branch 'score_shop' into api_score_meger

jyy

2021-09-03 b687aa0f371e12d4ec1813f18a4f889e8f825f67

 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不添加其他的关联属性 -->