Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/util/CommonUtil.java

@@ -35,4 +35,8 @@ public class CommonUtil {
         }
         return flag;
     }
+
+    public static BigDecimal  BigDecimal2Fix(BigDecimal bigDecimal){
+        return bigDecimal.setScale(2, BigDecimal.ROUND_DOWN);
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/common/util/StringUtil.java

@@ -88,4 +88,7 @@ public class StringUtil {
         //ARE_YOU_DOU_BI_YELLOWCONG
         System.out.println(camel2Underline(camel));
     }*/
+
+
+
 }

atms-web/src/main/webapp/Scripts/app.js

@@ -363,7 +363,9 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
                 systemId: '2500',
                 //当前用户ID
                 userId: loginContext.localName,
-                textStyle: 'rgba(0,0,0,0.15)',
+                textStyle: 'rgba(0,0,0,0.05)',
+                imgHeightDis: 230,
+                imgWidthDis: 230,
                 containerEl: document.querySelector('body')
             });