FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开耀和宇欢冲突之后的合并代码

Browse Source
This commit is contained in:
yanyizhou
2021-09-01 14:25:16 +08:00
parent fc608845d8
commit ee85f48542
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.List;
@Repository @Repository
public interface SarStandardInfoDao{ public interface SarStandardInfoDao{
public List<WarningEO> selectWithinTerm(DataDTO date, String str, String CLLX); public List<WarningEO> selectWithinTerm(DataDTO date, String str);
public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus);
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
+1 -1
View File
@@ -11,6 +11,6 @@ import java.util.List;
@Repository @Repository
public interface SarStandardItemDao extends BaseMapper{ public interface SarStandardItemDao extends BaseMapper{
public List<WarningEO> selectWithinTerm(DataDTO date, String str, String applyType); public List<WarningEO> selectWithinTerm(DataDTO date, String str);
} }