Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -641,7 +641,10 @@
            if (pole == null) {
                throw new BusinessException("灯杆不存在");
            }
            pole.setClientId(clientId);
            pole.setUserId(clientId);
            if(!clientService.findClientId(clientId)){
                pole.setClientId(clientService.getClientId(clientId));
            }
            r = updateById(pole);

            if (!r) {