提交merge1.3

openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java

@@ -18,16 +18,6 @@ import com.openhis.web.document.util.EnumUtil;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-<<<<<<< HEAD
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-=======
->>>>>>> v1.3
 
 /**
  * 文书定义 controller
@@ -40,6 +30,7 @@ import java.util.Map;
 @Slf4j
 @AllArgsConstructor
 public class DocDefinitionController {
+
     private final IDocDefinitionAppService iDocDefinitionAppService;
 
     /**
@@ -56,13 +47,8 @@ public class DocDefinitionController {
 
         // 获取权限枚举列表
         map.put("permissions", EnumUtil.toMapList(DocPermissionEnum.class));
-<<<<<<< HEAD
-        //使用范围枚举
-        List<String> noInUseCodes=new ArrayList<>();
-=======
         // 使用范围枚举
         List<String> noInUseCodes = new ArrayList<>();
->>>>>>> v1.3
         noInUseCodes.add(DocUseRangeEnum.USE_BY_SELF.getCode());
         map.put("useRanges", EnumUtil.toMapListFilter(DocUseRangeEnum.class, noInUseCodes));
         return R.ok(map);