Merge remote-tracking branch 'origin/main'

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -122,6 +122,7 @@ public class AppLoginController {
                 case 1:
                     return R.ok(null, "您的账号已通过");
                 case 2:
+                    register.setStatus(0);
                     appRegisterService.updateAppRegisterByPhone(register);
                     break;
             }

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml

@@ -177,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyName != null">company_name = #{companyName},</if>
             <if test="pushId != null">push_id = #{pushId},</if>
             <if test="nickname != null">nickname = #{nickname},</if>
-            status = 0,
+            <if test="status != null">status = #{status},</if>
         </trim>
         where phone = #{phone}
     </update>