Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-21 8cb8a874db01acd1113cfeb5c2c5bf7e9555ff65

 ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java

@@ -326,7 +326,7 @@
                }
                j.put("data",listResult);
            }else {
                j.put("data","[]");
                j.put("data",new ArrayList<>());
            }
        }else{
            //错误提示