Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-11 822b96ee741e429d80779cd17bb7c2c00dca44f2

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

@@ -50,7 +50,10 @@
   FROM
      question a
   LEFT JOIN vip_answer b ON a.id = b.quesion_id and b.vip_id=#{id}
   WHERE category=#{type}
   WHERE
   a.company_id=#{companyId}
   and category=#{type}

   ORDER BY order_field DESC
   </select>