From 9c5d7547fa9b37c09659c90448ade6df6db4f2de Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Tue, 15 Mar 2022 10:46:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop
---
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