Merge remote-tracking branch 'origin/master'

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.16</version>
+    <version>2.3.18</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>

src/main/ui/3614585395.txt

@@ -0,0 +1 @@
+ae353db63a041ba84f932eb760b9415e

src/main/ui/static/boot/managerMainApp.js

@@ -202,11 +202,12 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             }
             $scope.loadWechatBind = function () {
                 if (window.currentUser.wx_openid == null) {
-                    if ((window.currentUser.role & 4) > 0) {
+                    /*if ((window.currentUser.role & 4) > 0) {
                         $scope.managerBindWechat('static');
                     } else {
                         $scope.managerBindWechat(true);
-                    }
+                    }*/
+                    $scope.managerBindWechat(true);
 
                 }
             };

src/main/ui/static/boot/managerMainAppv2.js

@@ -319,11 +319,15 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
             $scope.loadWechatBind = function () {
                 if (window.currentUser.wx_openid == null) {
+/*
                     if ((window.currentUser.role & 4) > 0) {
                         $scope.managerBindWechat('static');
                     } else {
                         $scope.managerBindWechat(true);
                     }
+*/
+
+                    $scope.managerBindWechat(true);
 
                 }
             };