Merge branch 'master' of http://47.114.101.16:7070/ssy/jobticket

master/src/main/java/com/ruoyi/project/configuration/mapper/TMatterFeatureMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.configuration.mapper;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.configuration.domain.TMatterFeature;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
  */
 public interface TMatterFeatureMapper {
 
-    public List<String> queryByIds(String[] ids);
+    public List<String> queryByIds(@Param("ids") String[] ids);
 
     /**
      * 查询危害物质-危害性质

master/src/main/java/com/ruoyi/project/configuration/mapper/TMatterProtectMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.configuration.mapper;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.configuration.domain.TMatterProtect;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
  */
 public interface TMatterProtectMapper {
 
-    public List<TMatterProtect> queryByIds(String[] ids);
+    public List<TMatterProtect> queryByIds(@Param("ids") String[] ids);
 
     /**
      * 查询危害物质-防护用品