From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 31 Jul 2021 17:30:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java index b0c67a9..450560e 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java @@ -40,7 +40,7 @@ /** * 配送方式 */ - private String shippingMethod; + private Integer shippingMethod; /** * 拼团ID -- Gitblit v1.9.1