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

无关风月

2025-06-25 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MonitorController.java

@@ -208,6 +208,7 @@
        monitorInfoVO.setCityName(one.getCity());
        monitorInfoVO.setName(one.getRealName());
        monitorInfoVO.setPhone(one.getPhone());
        monitorInfoVO.setProfilePicture(one.getProfilePicture());
        for (JSONObject string : strings) {
            if (string.getString("terid").equals(terid)){
                monitorInfoVO.setLicensePlateNumber(string.getString("carlicence"));