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

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/EnterpriseAccountSetOrgExtendsMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.EnterpriseAccountSetOrgMapper">
     <resultMap extends="BaseResultMap" id="ResultMapWithAssociation"
                type="pwc.taxtech.atms.entity.EnterpriseAccountSetOrg">
-        <association column="OrganizationID" property="organization"
+        <association column="ORGANIZATION_ID" property="organization"
                      select="pwc.taxtech.atms.dao.OrganizationMapper.selectByPrimaryKey"/>
     </resultMap>
     <select id="selectByExampleWithAssociation" parameterType="pwc.taxtech.atms.entity.EnterpriseAccountSetOrgExample"

atms-dao/src/main/resources/pwc/taxtech/atms/invoice/InputMaterialItemMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="pwc.taxtech.atms.vat.dao.InputMaterialItemMapper">
+<mapper namespace="pwc.taxtech.atms.invoice.InputMaterialItemMapper">
   <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.InputMaterialItem">
     <!--
       WARNING - @mbg.generated

atms-web/src/main/webapp/app/admin/basicData/financialData/customerListManage/customer-list-manage.html

@@ -94,9 +94,9 @@
 
                     <input type="hidden" id="enterpriseAccountSetID" value="{{editModel.enterpriseAccountSetID}}" />
                     <div class="form-group">
-                        <label for="code" class="col-sm-3 control-label">{{'EnterpriceAccountSetName' | translate}}：</label>
+                        <label for="code" class="col-sm-3 control-label">{{'EnterpriseAccountSetName' | translate}}：</label>
                         <div class="col-sm-6">
-                            <input class="form-control" id="enterpriceAccountSetName" readonly name="enterpriceAccountSetName" ng-model="editModel.enterpriceAccountSetName" maxlength="50" placeholder="" required>
+                            <input class="form-control" id="enterpriseAccountSetName" readonly name="enterpriseAccountSetName" ng-model="editModel.enterpriceAccountSetName" maxlength="50" placeholder="" required>
                         </div>
                     </div>
 

atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.html

@@ -358,8 +358,7 @@
                     <form class="form-horizontal" id="updateEnterpriceAccountSetRelevantOrgForm">
                         <input type="hidden" value="{{editModel.id}}"/>
                         <div class="form-group">
-                            <label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetName' |
-                                translate}}：</label>
+                            <label for="code" class="col-sm-2 control-label">{{'EnterpriseAccountSetName' | translate}}：</label>
                             <div class="col-sm-4">
                                 <label class="control-label" style="width: none;">{{editModel.name}}</label>
                             </div>