From 0b30ecf9d6581b4e7a6f7b397ced716acaeaefc0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:15:37 +0800
Subject: [PATCH] 更新冲突

---
 UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
index 5f69be8..8a564f8 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
@@ -13,6 +13,7 @@
     @Autowired
     private DownGlassInfoMapper downGlassInfoMapper;
 
+
     public DownGlassInfo getDownGlassInfoById(Integer id) {
         return downGlassInfoMapper.selectById(id);
     }

--
Gitblit v1.8.0