Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

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

@@ -131,8 +131,8 @@
         a.count,
         a.proj_id,
         b.su_name,
         c.name as goods_name,
         c.seal_pice as goods_seal_pice,
            d.proj_name as goods_name,
            d.price as goods_seal_pice,
         c.TIME_LENGTH as goods_time_length,
            d.id as pu_id,
            d.SURPLUS_COUNT as pu_SURPLUS_COUNT,