Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 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>