From 4a69dbd169795bd4ad82a049444c94d09ca26d67 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 13 五月 2024 08:49:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java index 83bc50b..aedecb4 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java @@ -1,16 +1,18 @@ package com.mes.workstation.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mes.workstation.entity.UpWorkstation; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.Map; -import org.apache.ibatis.annotations.*; -import com.mes.workstation.entity.UpWorkstation; @Mapper public interface LoadGlassMapper extends BaseMapper<UpWorkstation> { //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖 @Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " + "on a.pattern_width=b.width and a.pattern_heigth=b.width " + "and a.pattern_thickness=b.thickness where a.workstation_id=#{id}") - Map<String,Object> selectPriority(int id); - + Map<String, Object> selectPriority(int id); + } -- Gitblit v1.8.0