bug修复

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserController.java

@@ -152,6 +152,15 @@ public class ApiUserController extends AbstractApiController {
         return R.ok();
     }
 
+    /**
+     * 是否设置支付密码
+     */
+    @ApiOperation("是否设置支付密码")
+    @GetMapping("/isSetPayPassword")
+    public R<Boolean> isSetPayPassword() {
+        return R.ok(iUserService.isSetPayPassword(getUserId(true)));
+    }
+
     /**
      * 设置支付密码
      */

ruoyi-info/src/main/java/com/ruoyi/info/version/domain/bo/AppVersionBo.java

@@ -45,6 +45,13 @@ public class AppVersionBo extends BaseEntity {
     @NotNull(message = "类型：0：安卓；1：IOS；不能为空", groups = { AddGroup.class, EditGroup.class })
     private AppVersionType type;
 
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号", required = true)
+    @NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String version;
+
     /**
      * 是否强制更新
      */

ruoyi-info/src/main/java/com/ruoyi/info/version/domain/vo/AppVersionVo.java

@@ -45,6 +45,13 @@ public class AppVersionVo {
     @ApiModelProperty("类型：0：安卓；1：IOS；")
     private AppVersionType type;
 
+    /**
+     * 版本号
+     */
+    @ExcelProperty(value = "版本号")
+    @ApiModelProperty("版本号")
+    private String version;
+
     /**
      * 是否强制更新
      */

ruoyi-user/src/main/java/com/ruoyi/user/service/IUserService.java

@@ -197,4 +197,6 @@ public interface IUserService {
     TableDataInfo<UserVo> queryBusinessPageList(UserBo bo, PageQuery pageQuery);
 
     Boolean updateStatus(Long id);
+
+    Boolean isSetPayPassword(Long userId);
 }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -835,6 +835,12 @@ public class UserServiceImpl implements IUserService {
         return true;
     }
 
+    @Override
+    public Boolean isSetPayPassword(Long userId) {
+        User user = baseMapper.selectOne(new LambdaQueryWrapper<User>().select(User::getPayPassword).eq(User::getId, userId));
+        return ObjectUtil.isNotNull(user) && StringUtils.isNotEmpty(user.getPayPassword());
+    }
+
     private String generateUniqueMemberCode(Long userId) {
         //生成唯一码 用户不会重复 6-8位
         String userIdPart = String.valueOf(userId);