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

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

@@ -229,8 +229,11 @@
                 </div>
             </div>
             <div class="modal-footer">
+                <!--                <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"-->
+                <!--                        ng-disabled="!hasEditPermission">{{'Confirm' | translate }}-->
+                <!--                </button>-->
                 <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"
-                        ng-disabled="!hasEditPermission">{{'Confirm' | translate }}
+                >{{'Confirm' | translate }}
                 </button>
                 <button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled"
                         ng-disabled="isDisabled">{{'ButtonCancel' | translate }}