Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -174,7 +174,7 @@
     "DashboardOTRiskDashboard": "风险仪表盘",
     "DashboardOTRiskWarning": "风险提示",
     "DashboardOTSubtotal": "税负汇总情况",
-    "DashboardOTSubtotalByBusinessUnit": "事业部汇总",
+    "DashboardOTSubtotalByBusinessUnit": "业务线汇总",
     "DashboardOTSubtotalByOrganization": "机构汇总",
     "DashboardOTSubtotalByRegion": "区域汇总",
     "DashboardOTTaxBurdenDistribution": "税负分布",
@@ -660,7 +660,7 @@
     "ShowPageItem": "条",
     "ShowPerPageCount": "每页显示",
     "ShowRelevantAmount": "借贷方相关金额",
-    "SortByBusinessUnit": "按事业部",
+    "SortByBusinessUnit": "按业务线",
     "SortByOrganization": "按机构",
     "SortByRegion": "按区域",
     "SortByTaxBurdenAmount": "按税负额",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json

@@ -51,27 +51,27 @@
     "BeginImport": "开始导入",
     "Browse": "浏览...",
     "BusinessUnitActive": "已启用",
-    "BusinessUnitAddNew": "添加事业部",
+    "BusinessUnitAddNew": "添加业务线",
     "BusinessUnitAddSuccess": "添加成功",
     "BusinessUnitCancel": "取消",
     "BusinessUnitDeleteSuccess": "删除成功",
     "BusinessUnitDisabled": "已停用",
     "BusinessUnitDisabledNode": "停用",
-    "BusinessUnitDuplicateNode": "事业部名称重复",
+    "BusinessUnitDuplicateNode": "业务线名称重复",
     "BusinessUnitEdit": "编辑",
     "BusinessUnitEditSuccess": "修改成功",
-    "BusinessUnitEmptyNode": "事业部名称不能为空,且至少需要2个字符",
+    "BusinessUnitEmptyNode": "业务线名称不能为空,且至少需要2个字符",
     "BusinessUnitEnableNode": "启用",
-    "BusinessUnitName": "事业部名称",
+    "BusinessUnitName": "业务线名称",
     "BusinessUnitNoSelected": "未选择操作数据行",
     "BusinessUnitOperation": "操作",
     "BusinessUnitOperationSuccess": "操作成功",
-    "BusinessUnitOutOfLengthNode": "事业部名称不能超过50个字符",
+    "BusinessUnitOutOfLengthNode": "业务线名称不能超过50个字符",
     "BusinessUnitSave": "保存",
     "BusinessUnitStatus": "使用状态",
-    "BusinessUnitStatusUnsureness": "事业部状态不确定",
-    "BusinessUnitTitle": "事业部",
-    "BusinessUnitUpdate": "修改事业部信息",
+    "BusinessUnitStatusUnsureness": "业务线状态不确定",
+    "BusinessUnitTitle": "业务线",
+    "BusinessUnitUpdate": "修改业务线信息",
     "CannotDeleteAreaTips": "存在使用该区域的机构，不能停用！",
     "CannotDeleteRegionTips": "该区域:{name}下还有子区域不能删除!",
     "CannotFindAreaByID": "未查到ID为：{id}的区域。",
@@ -213,7 +213,7 @@
     "ExpiredDateTo": "至",
     "ExtraRole": "附加角色",
     "FieldareaName": "区域",
-    "FieldbusinessUnitName": "事业部",
+    "FieldbusinessUnitName": "业务线",
     "FieldindustryName": "行业",
     "FieldorgCode": "机构代码",
     "FieldorgName": "机构名称",
@@ -256,7 +256,7 @@
     "OperationAddInvalid": "请先保存修改操作",
     "OperationEditInvalid": "请先保存新增操作",
     "OrangizationStructureTabTitle": "机构层级",
-    "OrganizationBusinessUnitNameRequired": "请选择事业部",
+    "OrganizationBusinessUnitNameRequired": "请选择业务线",
     "OrganizationDetailsList": "机构详细列表",
     "OrganizationManageTitle": "组织机构管理",
     "OrganizationStructureActive": "已启用",
@@ -371,7 +371,7 @@
     "TaxableState": "应税状态",
     "TemplateName": "报表名称",
     "UpdateArea": "修改区域",
-    "UpdateBusinessUnit": "修改事业部",
+    "UpdateBusinessUnit": "修改业务线",
     "UpdateCustomer": "修改客户列表",
     "UpdateEnterpriseAccount": "修改科目",
     "UpdateEnterpriseAccountSet": "修改账套",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -240,7 +240,7 @@
     "After": "以后",
     "AgriculturalProduct": "农产品发票",
     "AllArea": "所有区域",
-    "AllBusinessUnit": "所有事业部",
+    "AllBusinessUnit": "所有业务线",
     "AllMappingStatus": "所有对应状态",
     "AllOrganization": "所有机构",
     "AllTask": "全部",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json

@@ -84,7 +84,7 @@
     "DefaultRole": "角色：",
     "PDefaultRole": "默认角色",
     "PIndustry": "行业",
-    "Business": "事业部",
+    "Business": "业务线",
     "Area": "区域",
     "ProjectList": "项目列表",
     "ProjectNameCol": "项目名称",
@@ -148,7 +148,7 @@
     "ComfirmUpdate": "确认修改？",
     "UpdateOrgExtraInfoTips": "将修改机构-其他信息，是否确认修改？",
     "CancelChangeEquityInfoTips": "将撤销变更-股权信息，是否确认修改？",
-    "BusinessUnitTitleName": "事业部",
+    "BusinessUnitTitleName": "业务线",
     "AreaTitleName": "区域",
     "IndustryTitleName": "行业",
     "UserTitleName": "用户",
@@ -482,7 +482,7 @@
     "LocalEducationAttach": "地方教育费附加",
     "WaterFund": "水利基金",
     "StampTax": "印花税",
-    "AllBusinessUnit": "所有事业部",
+    "AllBusinessUnit": "所有业务线",
     "AllArea": "所有区域",
     "AllOrganization": "所有机构",
     "AllTax": "所有税种",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -163,7 +163,7 @@
     "After": "以后",
     "AgriculturalProduct": "农产品发票",
     "AllArea": "所有区域",
-    "AllBusinessUnit": "所有事业部",
+    "AllBusinessUnit": "所有业务线",
     "AllMappingStatus": "所有对应状态",
     "AllOrganization": "所有机构",
     "AllTax": "所有税种",