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/system/hiveErp/analysUtil/SeriesVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/SeriesVo.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/SeriesVo.java
index cfbb8a1..9a75390 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/SeriesVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/SeriesVo.java
@@ -9,13 +9,13 @@
private String name;
- private Integer[] data;
+ private String[] data;
private String type="line";
public SeriesVo() {
}
- public SeriesVo(String name, Integer[] data, String type) {
+ public SeriesVo(String name, String[] data, String type) {
this.name = name;
this.data = data;
this.type = type;
@@ -29,11 +29,11 @@
this.name = name;
}
- public Integer[] getData() {
+ public String[] getData() {
return data;
}
- public void setData(Integer[] data) {
+ public void setData(String[] data) {
this.data = data;
}
--
Gitblit v1.9.1