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

gongchunyi

2026-01-15 293dad30b91c26329aa165c6329220220e5bf8a1

 cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java

@@ -18,8 +18,8 @@
     */
    void addBridgeValue(JSONObject jsonObject);

    void dcResistanceDataAnalysis(String jsonStr,String deviceCode);
    void dcResistanceDataAnalysis(String jsonStr);

    void elongationDataAnalysis(String jsonStr,String deviceCode);
    void elongationDataAnalysis(String jsonStr);
}