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

gongchunyi

2 天以前 6a939851b9561fea92ec29c59fa9e47ab9467ff7

 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);
}