From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3

---
 server/src/main/resources/mappers/BomExtMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/src/main/resources/mappers/BomExtMapper.xml b/server/src/main/resources/mappers/BomExtMapper.xml
index 2ae61f3..5d5cd41 100644
--- a/server/src/main/resources/mappers/BomExtMapper.xml
+++ b/server/src/main/resources/mappers/BomExtMapper.xml
@@ -564,7 +564,7 @@
     `dmodel`.`STATUS` AS DMODEL_STATUS,
     `dmodel`.`VALID_TIME` AS DMODEL_VALID_TIME,
     `dmodel`.`INVALID_TIME` AS DMODEL_INVALID_TIME,
-    `mmodel`.`ID` AS realMaterialId,
+    `mmodel`.`ID` AS MMODEL_ID,
     `mmodel`.`DELETED` AS MMODEL_DELETED,
     `mmodel`.`CREATE_USER` AS MMODEL_CREATE_USER,
     `mmodel`.`CREATE_TIME` AS MMODEL_CREATE_TIME,

--
Gitblit v1.9.3