Merge remote-tracking branch 'origin/master' into master

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/AppVersionDetailController.java

@@ -36,11 +36,12 @@ public class AppVersionDetailController extends BladeController {
     @GetMapping("/getNewVersion")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取最新版本", notes = "传入版本id与软件类型1安卓2IOS")
-    public R<AppVersionDetail> getNewVersion(String platform,Integer softwareType){
+    public R<AppVersionDetail> getNewVersion(String platform,Integer softwareType,Integer fileType){
         AppVersion one = versionService.getOne(new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getPlatform, platform));
         return R.data(versionDetailService.getOne(new LambdaQueryWrapper<AppVersionDetail>()
                             .eq(AppVersionDetail::getVersionId,one.getId())
                             .eq(AppVersionDetail::getSoftwareType,softwareType)
+                            .eq(AppVersionDetail::getFileType,fileType)
                             .orderByDesc(AppVersionDetail::getUpdateDate)
                             .last("limit 1")));
     }