From bf5c42b55da25fbcbb8f92bde539a8e27d800b40 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:16:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
index f8d99d6..54e486f 100644
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
+++ b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
@@ -1,18 +1,20 @@
 package com.mes.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.OrderTest;
+import com.mes.entity.GlassInfo;
 import com.mes.entity.Tempering;
 
 import org.apache.ibatis.annotations.*;
 
 @Mapper
-public interface OrderTestMapper extends BaseMapper<OrderTest> {
+public interface TemperingMapper extends BaseMapper<Tempering> {
 
 
 //鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
-@Select("select*from where id=#{glassId}")
-Tempering SelectTempering(String glassId);
+@Select("select *from glass_info where id=#{glassid};")
+GlassInfo SelectOutGlass(String glassid);
 
+@Select("select *from glass_info where id=#{glassid};")
+int SelectTempering(String glassid);
 
 }

--
Gitblit v1.8.0