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

ke

2024-08-19 c5f6f451fcd2a5257315590c5a256766fa68e433

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/enums/DamEnum.java

@@ -16,27 +16,27 @@
   /**
    * 渗压
    */
   SY("1","seepage","/services/1234567890ABCDEFGHIJKLMN/realtime/op/sy/api"),
   SY("1","seepage","/services/1234567890ABCDEFGHIJKLMN/sy/realtime/v2/api"),

   /**
    * 渗流
    */
   SL("2","lsy" ,"/services/1234567890ABCDEFGHIJKLMN/realtime/op/sl/api"),
   SL("2","lsy" ,"/services/1234567890ABCDEFGHIJKLMN/sl/realtime/v2/api"),

   /**
    * x 位移
    * 位移_x 上下游
    */
   X("3","deform_x","/services/1234567890ABCDEFGHIJKLMN/"),
   X("3","deform_x","/services/1234567890ABCDEFGHIJKLMN/wy/realtime/v2/api"),

   /**
    * y 位移
    * 位移_y 左右岸
    */
   Y("4","deform_y","/services/1234567890ABCDEFGHIJKLMN/"),
   Y("4","deform_y","/services/1234567890ABCDEFGHIJKLMN/wy/realtime/v2/api"),

   /**
    * z 位移
    * 位移_z 垂直
    */
   Z("5","deform_z","/services/1234567890ABCDEFGHIJKLMN/"),
   Z("5","deform_z","/services/1234567890ABCDEFGHIJKLMN/wy/realtime/v2/api"),
   ;

   /**