Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-10 49a02aa2071bcaf94f0f8c19e2578cd7650160a4

 src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js

@@ -149,8 +149,12 @@
                                $scope.vm.form.tel = result.data.content.tel;
                                $scope.vm.form.url = result.data.content.url;
                                $scope.vm.form.memo = result.data.content.memo;
                                $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
                                $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
                                if(result.data.content.ispFieldVo != null){
                                    $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
                                }
                                if(result.data.content.hostingFieldVo != null){
                                    $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
                                }
                            }
                        }
                        else {