Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

vat-organization-structure span float

See merge request root/atms!155

atms-web/src/main/webapp/app/admin/basicData/masterData/orangizationStructureManage/orangization-structure-manage.ctrl.js

@@ -161,7 +161,7 @@
                         field: 'name',
                         name: $translate.instant('OrganizationStructureName'),
                         width: '50%',
-                        cellTemplate: '<div class="orangization-structure-gridcell-name" style="text-align: center"><span style="text-align: center;float:left;">{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
+                        cellTemplate: '<div class="orangization-structure-gridcell-name" style="text-align: center"><span>{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
                     }, {
                         field: 'isActive',
                         name: $translate.instant('OrganizationStructureStatus'),