Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPDisconnectReq.java

@@ -26,8 +26,12 @@
    * 解析报文
    */
   public UPDisconnectReq decode(ByteBuf byteBuf) {
      this.userId = byteBuf.readInt();
      this.password = Jtt809Util.readGBKString(byteBuf, 12);
      try {
         this.userId = byteBuf.readInt();
         this.password = Jtt809Util.readGBKString(byteBuf, 12);
      }catch (Exception e){
         e.printStackTrace();
      }
      return this;
   }
}