Merge remote-tracking branch 'origin/master'

src/main/resources/dev/bootstrap.yml

@@ -61,6 +61,7 @@ spring:
     port: 14000
     password: Tf%JL!vd7R%j3x&e
 
+
 logback:
   file: D:\data\DK_MES\${spring.application.name}
 

src/main/resources/mapper/UserMapper.xml

@@ -130,7 +130,7 @@
             ,joined_cps = #{joinedCps,typeHandler=IntListTypeHandler}
         </if>
         where user_id = #{userId}::uuid
-        and current_cp not in (2,3)
+        and user_wxid not in ('std_test','pro_test')
     </update>
 
     <!--离职时候更新 用户的openid current_cp  , "joined_cps"   缩减相应的cpid-->