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

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java

@@ -62,7 +62,7 @@
   public BDDataPo(DataResChildrenPo po,String type){
      this.damId = po.getRes_cd();
      this.pointId = po.getCd();
      this.pointName = "测点"+po.getCd();
      this.pointName = po.getCd_nm();
      this.type = type;

      if (type.equals( "1")){