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

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateTemplatePageDto.java

@@ -23,7 +23,7 @@ import java.util.Map;
 @EqualsAndHashCode(callSuper = false)
 public class EvaluateTemplatePageDto extends PageInput {
     @ApiModelProperty("使用部门")
-    public Map<Long, String> deptIds;
+    public String deptIds;
 
     @ApiModelProperty("评价类型")
     public String evaluateType;

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateTemplateServiceImpl.java

@@ -54,7 +54,7 @@ public class EvaluateTemplateServiceImpl extends MPJBaseServiceImpl<EvaluateTemp
             StringBuilder deptName = new StringBuilder();
             for (int i = 0; i < deptIds.length; i ++){
                 if(i > 0){
-                    deptName .append(",");
+                    deptName.append(",");
                     deptIdSb.append(",");
                 }
                 deptName.append(departmentMap.get(deptIds[i]));