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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java

@@ -5,7 +5,7 @@

/**
 * @description 发货明细
 * @author yourName
 * @author jyy
 * @date 2019-10-21 15:02
 */
public class ShopDeliveryDetail  extends EntityDTO{