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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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);
}