Merge remote-tracking branch 'origin/master'

zhoushihao

2024-04-16 99f113b35308144878037b808697c2075c811041

 CacheGlassModule/src/main/java/com/mes/MesApplication.java

@@ -1,7 +1,7 @@
package com.mes;

import com.mes.common.PlcTools.S7object;
import com.mes.mapper.SelectInfo;
import com.mes.mapper.PpMapper;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;