Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

DYL0109

2025-04-16 75f043dfa6660716364e66ee0b3cf99f44255686

 zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java

@@ -65,6 +65,9 @@

    int dapHasExistWhenUpdate(@Param("id") String id, @Param("code") String code, @Param("deviceType") String deviceType);

    int dapCodeHasExist(@Param("kay") String key, @Param("deviceType") String deviceType);

    int dapCodeHasExistWhenUpdate(@Param("id") String id, @Param("key") String code, @Param("deviceType") String deviceType);
    /**
     * 查询指标模板信息
     *