Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

basicData module test and correct

See merge request root/atms!135

atms-web/src/main/webapp/WEB-INF/templates/index.html

@@ -130,7 +130,7 @@
             <!--window.location.href = '/#/overview/assetsManage';-->
         <!--}-->
         <!--else {-->
-            window.location.href = '/#/summary';
+            window.location.href = '/#/overview/vat';
         <!--}-->
         // create the back to top button
         $('body').prepend('<a href="#" class="back-to-top">Back to Top</a>');

atms-web/src/main/webapp/bundles/framework.js

@@ -1965,9 +1965,9 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
                 $scope.dateFormat = $translate.instant('dateFormat4Year');
             }
             if ($scope.serviceTypeId === enums.serviceType.VAT) {
-                $scope.systemTitle = $translate.instant('VATTitle');
+                $scope.systemTitle = $translate.instant('增值税申报');
                 $scope.viewMode = 1;
-                $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
+                $scope.dateFormat = $translate.instant(' yyyy 年 mm 月');
             }
             if ($scope.serviceTypeId === enums.serviceType.AssetsManage) {
                 $scope.systemTitle = $translate.instant('AssetTitle');