Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

 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>