Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-23 87c7eb357cbeba1e3bd0847ea69da4dee9d3cc29

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignWriteoffDao.java

@@ -25,4 +25,6 @@
   ZjrVo selectUsernameByUserId(@Param("userId")Long userId, @Param("receiveId")Long receiveId);

    ShopDeliveryInfo selectShopDeliveryInfoByLogisticsId(@Param("logisticsId")Integer logisticsId);

   ActivitySignWriteoff selectActivitySignWriteoffByUserIDAndReceiveId(@Param("userId")Long userId, @Param("receiveId")long receiveId);
}