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/hive/bean/ArticleType.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java
index 884b2c7..fc2cee1 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java
@@ -56,6 +56,10 @@
private String type;
private Long shopId;
+
+ private String parentIds;
+
+ private Long companyId;
/**
* 扩展属性
@@ -81,6 +85,15 @@
public void setArticle(Article article) {
this.article = article;
}*/
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
public Long getId() {
return id;
}
@@ -159,6 +172,14 @@
this.type=type;
}
+ public String getParentIds() {
+ return parentIds;
+ }
+
+ public void setParentIds(String parentIds) {
+ this.parentIds = parentIds;
+ }
+
@Override
public String toString() {
return "ArticleType [id=" + id + ", articleTypeName=" + articleTypeName
--
Gitblit v1.9.1