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

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

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

@@ -26,5 +26,5 @@

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

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