From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java
index 65b23ef..d8593f4 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java
@@ -20,7 +20,7 @@
private Integer orderStatus;
@ApiModelProperty(hidden = true)
- private String userId;
+ private Long userId;
--
Gitblit v1.9.1