From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
index 7450dda..94b8b15 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
@@ -63,6 +63,12 @@
private Long orderItemId;
/**
+ * 订单id
+ */
+ @Extend
+ private Long orderId;
+
+ /**
* 单次扣减金额（理解为单次手工业绩）
* =订单金额/订单数量
* 如果是赠送则等于产品原价，业绩记录为赠销
@@ -138,6 +144,14 @@
private String updateRemark;
+ public Long getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Long orderId) {
+ this.orderId = orderId;
+ }
+
public String getUpdateRemark() {
return updateRemark;
}
--
Gitblit v1.9.1