Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

@@ -34,6 +34,7 @@ func (dao OrderBaseDao) CheckOrderExist(companyId int64, orderCode string,
 	query := tx.Model(&models.OrderBase{}).
 		Where("company_id=?", companyId).
 		Where("order_code=?", orderCode).
+		Where("delivery_code=?", deliveryCode).
 		Where("partner_id=?", partnerId).
 		Where(`partner_category @>'{"id":?}'`, partnerCategory).
 		Where("id<>?", notId)