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

935090232@qq.com

2021-07-29 bf60845c8da9d0099ef25c8e6703351055865a8e

 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>