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

xiaoyong931011

2021-04-20 55301b09ac1e68bdd081683c4dea9426ecd70460

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml

@@ -105,8 +105,9 @@
      SELECT
         *
      FROM
         shop_delivery_info a
      where a.id = #{logisticsId}
         activity_sign_writeoff a
      where a.receive_id = #{logisticsId}
         and a.user_id = #{userId}
   </select>

</mapper>