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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 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"));