Merge branch 'develop' into develop-debt

* develop:
  用户表同步状态修改

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserServiceImpl.java

@@ -140,7 +140,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                     userBank.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "Status":
-                    if(Integer.parseInt(fieldDataMap.get(field).toString()) == 0){
+                    if(Integer.parseInt(fieldDataMap.get(field).toString()) == 0 || Integer.parseInt(fieldDataMap.get(field).toString()) == 1){
                         user.setStatus(1);
                     }else{
                         user.setStatus(0);

kxs-transfer/src/main/resources/import.txt

@@ -1,5 +1,5 @@
 //用户基础信息表
-select Id as id, (case Status when  0 then 1 when -1 then 0 else 0 end ) as status, RealName as username, Mobile as phone, ReferralUserId as hidden_level, Areas as address,
+select Id as id, (case Status when  0 then 1 when -1 then 0 else 1 end ) as status, RealName as username, Mobile as phone, ReferralUserId as hidden_level, Areas as address,
 ParentUserId as pid, CONCAT('0',REPLACE(ParentNav,',,',','))  as pid_path, MakerCode as user_code, HeadPhoto as avatar,
 UserLevel as user_level, AuthFlag as real_status, MerchantType as is_merchant_maker, Remark as remark, CreateDate as create_time, UpdateDate as update_time
 FROM Users