Merge branch 'developer' into 'master'

企业微信性别字段默认为0

See merge request !968

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -241,7 +241,8 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         staff.setPhoneNumber(phoneNumber);
         staff.setNationCode(nationCode);
-        staff.setSex(user.getGender() == null ? 1 : Integer.parseInt(user.getGender()));
+        //由于企业微信取不到用户性别字段，默认性别为0
+        staff.setSex(user.getGender() == null ? 0 : Integer.parseInt(user.getGender()));
         staff.setPostion(user.getPosition());
         staff.setExtendPostion(user.getExternal_position());
         String qr_code = user.getQr_code();