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

atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js

@@ -592,11 +592,11 @@
                                 url: '#/vat/generateReport'
                             });
                             subMenus.push({
-                                name: 'generateReport',
-                                state: 'generateReport',
+                                name: 'generateReport.reportView',
+                                state: 'generateReport.reportView',
                                 num: 4,
                                 permission: constant.vatPermission.reportView.reportViewCode,
-                                url: '#/vat/generateReport'
+                                url: '#/vat/generateReport/reportView'
                             });
                         }