Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!339

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -641,13 +641,7 @@ public class WorkFlowController {
                                     map.put("comment","不同意");
                                     break;
                                 default:
-                                    String commentText="";
-                                    map.put("comment",comment+map.get("commentText"));
                             }
-
-                        }else if (map.get("commentText")!=null && !"".equals(map.get("commentText"))){
-                            map.put("comment",map.get("commentText").toString());
-
                         }
                         ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class);
                         exportDatas.add(user);

adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java

@@ -16,7 +16,7 @@ public class ProcessDetailExport {
     @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15)
     private Date endTime;
     @Excel(name = "流程信息", orderNum = "5",width = 15)
-    private String comment;
+    private String commentText;
     @Excel(name = "状态", orderNum = "6",width = 15)
     private String flag;
 }