Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

jinsy 7 years ago
parent
commit
6a317e183f

+ 0 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -322,7 +322,6 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             map.put("v_res","");
             vendorMapper.check(map);
             Object result =  map.get("v_res");
-            System.out.println("result:" + result);
             if(!StringUtils.isEmpty(result)){
                 throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
             }else{

+ 2 - 1
frontend/saas-portal-web/static/css/invitation_mobile_join.css

@@ -127,9 +127,10 @@ body {
     background: url(../img/assets/expand.png)no-repeat right;
 }
 .btn-check{
+    padding-top: 4px;
     border-top-right-radius: 30px;
     border-bottom-right-radius: 30px;
-    margin-top: -33px;
+    margin-top: -35px;
     margin-left: 30px;
     line-height: 20px;
     height: 30px;