From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java
index 5ce1798..0b1dc87 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java
@@ -20,7 +20,7 @@
     /**
      *返回对象信息
      */
-    private Object data;
+    private String data;
     /**
      *返回的是否成功标识
      */

--
Gitblit v1.7.1