From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java
index 2f66fc3..328a3e2 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.crm.dal.dataobject.business;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -38,17 +37,21 @@
*/
private Long businessId;
/**
- * 浜у搧缂栧彿
+ * MDM 鐗╂枡缂栧彿
*
- * 鍏宠仈 {@link CrmProductDO#getId()}
+ * 鍏宠仈 MdmItemRespDTO.id
*/
- private Long productId;
+ private Long itemId;
/**
- * 浜у搧鍗曚环锛屽崟浣嶏細鍏�
+ * 璁￠噺鍗曚綅缂栧彿
*
- * 鍐椾綑 {@link CrmProductDO#getPrice()}
+ * 鍏宠仈 MdmUnitMeasureRespDTO.id
*/
- private BigDecimal productPrice;
+ private Long itemUnitId;
+ /**
+ * 鐗╂枡鍘熶环锛屽崟浣嶏細鍏冿紙鍐椾綑锛�
+ */
+ private BigDecimal itemPrice;
/**
* 鍟嗘満浠锋牸, 鍗曚綅锛氬厓
*/
--
Gitblit v1.9.3