采购历史增强代码

ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml

@@ -20,6 +20,7 @@
         <result property="remark"      column="remark"/>
         <result property="projectName" column="project_name"/>
         <result property="status"      column="status"/>
+        <result property="nearestEndTime"      column="nearest_end_time"/>
 
         <collection property="warehouseList"
                     column="master_id"
@@ -48,6 +49,7 @@
             sowm.sign_user,
             sowm.remark,
             sowm.status,
+            ${ew.sqlSelect},
             sop.project_name
         FROM sys_oa_warehouse_master sowm
                  LEFT JOIN sys_oa_project sop