Merge remote-tracking branch 'origin/develop_3' into develop_3

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java

@@ -5,9 +5,11 @@ import com.adc.da.sys.entity.DicTypeEO;
 import com.adc.da.sys.page.DicTypeEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
 
     public DicTypeEO getDicTypeEOById(String id);