Merge branch 'score_shop' into ty_fix

Helius

2021-11-02 af7f37cbb7a0694c882bdc91174dca39796ad4ad

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