From 8bd08152f1114f086906fe1d3300d4e58302b371 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:35 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
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