1.机构税务信息类型；2.sso登出地址

atms-api/src/main/resources/conf/conf_profile_uat.properties

@@ -59,7 +59,7 @@ org_sync_token=174af08f
 dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
 
 
-ebs_call_url=172.20.201.98:8020/ebs-proxy-test/dts
+ebs_call_url=http://172.20.201.98:8020/ebs-proxy-test/dts
 
 #tableau config
 tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s

atms-web/src/main/java/pwc/taxtech/atms/web/controller/AccountController.java

@@ -208,7 +208,7 @@ public class AccountController {
             response.addCookie(ddTicketCookie);
             response.addCookie(ddJumptoCookie);
             // todo 这里写死为DD的登出地址了
-            response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500&jumpto=http://dts.erp.didichuxing.com:9001/sso/accept");
+            response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500&jumpto=http://dts-test.erp.didichuxing.com/sso/accept");
         } catch (Exception e) {
             logger.error("登出失败", e);
         }

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -530,7 +530,7 @@
                                                         <select class="input-group" style="display: none"
                                                             name="taxReturnBusinessType"
                                                             ng-model="editOrgExtraModel.taxReturnBusinessType"
-                                                            ng-options="x.code as x.code for x in taxReturnBusinessTypeList">
+                                                            ng-options="x.code as x.type for x in taxReturnBusinessTypeList">
                                                             <option value="">{{resources.TaxReturnBusinessType}}
                                                             </option>
                                                         </select>

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1506,7 +1506,7 @@ constant.TaxReturnBusinessTypeList = [
     {code: 100, type: "非跨地区经营企业"},
     {code: 210, type: "跨地区经营企业总机构 总机构（跨省）"},
     {code: 220, type: "总机构（跨省）——不适用《跨地区经营汇总纳税企业所得税征收管理办法》"},
-    {code: 230, type: "undefine"},
+    // {code: 230, type: "undefine"},
     {code: 311, type: "跨地区经营企业分支机构 需进行完整年度纳税申报 分支机构（须进行完整年度申报并按比例纳税）"},
     {code: 312, type: "分支机构（须进行完整年度申报但不就地缴纳）"}
 ];