From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
index 4421704..080b514 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
@@ -6,10 +6,11 @@
 import com.consum.base.service.LWhProcureModelUserService;
 import com.google.common.collect.Lists;
 import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.springframework.stereotype.Service;
 
 /**
  * @author asus
@@ -24,6 +25,7 @@
     public List<UseRecordDTO> selectUseRecord(Long businessId) {
         String sql = "SELECT\n"
             + "\tpmur.ID,\n"
+            + "\tpmu.id as oldProcureModelId,\n"
             + "\tpm.ID procureModelId,\n"
             + "\tpmur.DEAL_TIME updateTime,\n"
             + "\tpmur.OPERATOR_NAME updateUserName,\n"

--
Gitblit v1.9.1