Merge remote-tracking branch 'origin/master'

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

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

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

@@ -42,7 +42,7 @@ public class DevelopmentGuideController {
             @ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"),
             @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 {
             developmentGuideService.getDevelopmentFile(request, response);
         } catch (Exception e) {

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

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