Merge branch 'score_shop' into api_score_meger

wzy

2021-11-21 befa8124e15d7d7e2d2026c2596561b11a9ee573

 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>