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

935090232@qq.com

2021-04-20 b58adf14617cd852296bec9e1ca57978741c9f0a

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

@@ -380,6 +380,7 @@
      c.NAME as gs_NAME,
      c.UNIT as gs_UNIT,
      c.good_type as gs_good_type,
      c.measure as gs_measure,
      c.GOODS_SORT_ID as gs_GOODS_SORT_ID,
      c.SUPPLIER_ID as gs_SUPPLIER_ID,
      (select TYPE_NAME from sys_goods_type t where t.id=c.GOODS_SORT_ID) gs_goodsSortName,