From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Util.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Util.java b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Util.java
index 4c0692a..393f57b 100644
--- a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Util.java
+++ b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Util.java
@@ -67,6 +67,8 @@
     public static Object getObjectFromXML(String xml, Class<?> tClass) {
         //将从API返回的XML数据映射到Java对象
         XStream xStreamForResponseData = new XStream();
+        XStream.setupDefaultSecurity(xStreamForResponseData);
+        xStreamForResponseData.allowTypes(new Class[]{tClass});
         xStreamForResponseData.alias("xml", tClass);
         xStreamForResponseData.ignoreUnknownElements();//暂时忽略掉一些新增的字段
         return xStreamForResponseData.fromXML(xml);

--
Gitblit v1.9.1