Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java

@@ -8,7 +8,7 @@

/**
 * @description 发货明细
 * @author yourName
 * @author jyy
 * @date 2019-10-21 15:02
 */
public interface ShopDeliveryDetailDao{