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

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

-jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-jdbc_user=fintax_user_test2
-jdbc_password=Fintaxuser@123Test2
+jdbc_url=jdbc:mysql://10.88.128.65:8806/fintax_stage?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc_user=fintax_user_stage
+jdbc_password=Fintaxuser@123Stage
 #jdbc_password=111111
 jdbc_admin_db=taxadmin2018
 
@@ -31,7 +31,7 @@ max_file_length=104857600
 
 #Distributed ID Generate
 distributed_id_datacenter=10
-distributed_id_machine=15
+distributed_id_machine=16
 
 api.url=http://dts.erp.didichuxing.com
 

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

@@ -1215,15 +1215,15 @@
                                                     <!-- 有效开始时间 -->
                                                     <span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate">{{set.effectiveDateStr}}</span>
 
-                                                    <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
+                                                    <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" style="width: 33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
                                                         <input type="text" class="form_datetime form-control" ng-model="set.effectiveDateStr" id="{{set.fromID}}" ng-change="checkStartDate(set)" required />
                                                         <p ng-show="set.startDateError" class="has-error label">{{set.startDateError}}</p>
                                                     </div>
-                                                    <span class="col-sm-1 block-span">&nbsp;{{'ExpiredDateTo'|translate}}&nbsp;</span>
+                                                    <span class="col-sm-1 block-span"style="margin-top: -24px;">&nbsp;{{'ExpiredDateTo'|translate}}&nbsp;</span>
 
                                                     <!-- 有效结束时间 -->
                                                     <span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate"> {{set.expiredDateStr}}</span>
-                                                    <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
+                                                    <div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height"  style="width:33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
                                                         <input type="text" class="form_datetime form-control" ng-change="checkEndDate(set)" ng-model="set.expiredDateStr" id="{{set.toID}}" />
                                                         <!--<p ng-show="set.endDateError" class="has-error label">{{set.endDateError}}</p>-->
                                                     </div>