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

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
@@ -12,7 +12,7 @@ import java.util.List;
@Repository
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);
@@ -11,6 +11,6 @@ import java.util.List;
@Repository
public interface SarStandardItemDao extends BaseMapper{
public List<WarningEO> selectWithinTerm(DataDTO date, String str, String applyType);
public List<WarningEO> selectWithinTerm(DataDTO date, String str);
}