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

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

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

@@ -700,4 +700,10 @@
   </select>


   <select id="selectProjServicesByOrderItemId" resultMap="SysProjServicesMap">
      select a.* from sys_proj_services a
        inner join sys_beautician_state b on a.id=b.SERVICES_ID
        inner join sys_proj_use c on c.id=b.puse_id
      where ORDER_ITEM_ID=#{itemId} and a.STATE!='预约取消'
   </select>
</mapper>