From a3e62581af85d8a7ecece3c446c499d12d3905dc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Jul 2021 17:15:34 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 53acdbc..15c5f5d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -38,7 +38,8 @@
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
String accountPhone = model.getAccount();
- String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
+// String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
+ String name = model.getAccount();
model.setAccount(name);
model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
--
Gitblit v1.9.1