Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -587,7 +587,7 @@ public class WorkOrderManageController {
         LoginUser currentUser = UserUtil.getCurrentUser();
         WorkFlowLog workFlowLog=new WorkFlowLog();
         workFlowLog.setFlowId(id);
-        workFlowLog.setFlowType(1);
+        workFlowLog.setFlowType(2);
         workFlowLog.setFlowResult(remark);
         workFlowLog.setCreateBy(currentUser.getId()!=null?currentUser.getId().toString():null);
         workFlowLog.setDateCreate(new Date());