Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e

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

@@ -410,6 +410,7 @@
    <select id="selectItemDetail" resultType="java.util.HashMap" parameterType="java.util.HashMap">
        select
        f.SHOP_NAME,
        b.yy_time,
        b.consume_time,
        b.SERVICE_NO,
        d.su_name,
@@ -420,7 +421,8 @@
        a.COUNT,
        h.PRICE,
        h.SOURCE,
        a.STATE
        a.STATE,
        a.extract
        from sys_beautician_state a
        left join sys_proj_services b on a.SERVICES_ID=b.ID
        left join shopping_goods c on a.proj_id=c.id