wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangliwen 2022-04-26 09:53:35 +08:00
parent 0ae65d020d 4eade083b9
commit 406826f14e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java
View File

@ -69,7 +69,7 @@ public class CategoryController {
if (ObjectUtils.isEmpty(categoryDTO.getPid())) { if (ObjectUtils.isEmpty(categoryDTO.getPid())) {
File file = new File(devModelFilePath + File.pathSeparator + categoryDTO.getName()); File file = new File(devModelFilePath + File.pathSeparator + categoryDTO.getName());
//文件路径不存在，创建各种能力的子文件夹 //文件路径不存在，创建各种能力的子文件夹
if (! new File(devModelFilePath).exists()) { if (! file.exists()) {
try { try {
file.createNewFile(); file.createNewFile();
} catch (IOException e) { } catch (IOException e) {

2
renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java
View File

@ -42,7 +42,7 @@ public class DevelopmentGuideController {
@ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "resourceId", value = "能力ID", paramType = "query", required = false, dataType = "Long"), @ApiImplicitParam(name = "resourceId", value = "能力ID", paramType = "query", required = false, dataType = "Long"),
}) })
public void getDevelopmentFile(@ApiIgnore HttpServletRequest request, @ApiIgnore HttpServletResponse response) { public void getDevelopmentFile(HttpServletRequest request, HttpServletResponse response) {
try { try {
developmentGuideService.getDevelopmentFile(request, response); developmentGuideService.getDevelopmentFile(request, response);
} catch (Exception e) { } catch (Exception e) {

3
renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java
View File

@ -77,6 +77,9 @@ public class ResourceDTO implements Serializable {
private String isCollect; private String isCollect;
@ApiModelProperty(value = "评分") @ApiModelProperty(value = "评分")
private Long score; private Long score;
@ApiModelProperty(value = "申请结果")
private String applyState;
@ApiModelProperty(value = "属性信息") @ApiModelProperty(value = "属性信息")
private List<AttrEntity> infoList; private List<AttrEntity> infoList;