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

jyy

2021-03-12 baa79615425b71521e67ec8a9344b88ce53fc5de

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

@@ -137,7 +137,8 @@
            d.id as pu_id,
            d.SURPLUS_COUNT as pu_SURPLUS_COUNT,
            d.ASSEMBLE_ID as pu_ASSEMBLE_ID,
            d.price as pu_price
            d.price as pu_price,
          d.taocan_id as pu_taocan_id


      from sys_beautician_state a