Merge remote-tracking branch 'origin/developer' into test_branch

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -632,7 +632,7 @@
              expire_time = #{expireTime},
              active_code = #{activeCode},
              active_status = #{activeStatus}
-        where wx_open_user_id = #{staffId}
+        where  staff_id= #{staffId}
     </update>
 
 </mapper>
\ No newline at end of file