Merge branch 'refs/heads/master' into herb

baoshiwei

2024-12-11 7c585586e9bea943161676bd9d127e81123891c3

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java

old mode 100644
new mode 100755
@@ -142,7 +142,7 @@
      @Override
      public void run() {
        // 在这里编写定时执行的任务逻辑
        System.out.println("定时任务执行：" + new java.util.Date());
        //System.out.println("定时任务执行：" + new java.util.Date());
        if (mqttUtil.getMqttClient() == null || !mqttUtil.getMqttClient().isConnected()) {
          try {
            conn();