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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml

@@ -50,9 +50,7 @@
      <!--规格信息-->
      <association property="shopSku" column="s_id"
         select="com.matrix.system.shopXcx.dao.ShopSkuDao.selectById"/>
      <!--查询生产企业-->
      <association property="productionEnterprise" column="{pId=p_id}"
                select="selectProductionEnterpriseByPid"/>

   </resultMap>