Merge branch 'dev_v3.0.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFCustomFlow.java

@@ -40,9 +40,11 @@ public class TFCustomFlow extends BaseEntity implements Serializable {
     private TFCustomTypeEnum type;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
+    @TableField(value = "enable", updateStrategy = FieldStrategy.IGNORED)
     private Boolean enable;
 
     @ApiModelProperty(value = "是否发布，0：否，1：是")
+    @TableField(value = "publish", updateStrategy = FieldStrategy.IGNORED)
     private Boolean publish;
 
     @ApiModelProperty(value = "自定义流程源数据")

distributed-print/src/main/java/com/qmth/distributed/print/api/TFCustomFlowController.java

@@ -213,7 +213,7 @@ public class TFCustomFlowController {
                 throw ExceptionResultEnum.ERROR.exception("已存在流程数据，不能删除");
             }
         }
-        tfCustomFlow.setEnable(customFlowParam.getEnable());
+        tfCustomFlow.setEnable(!customFlowParam.getEnable() ? null : customFlowParam.getEnable());
         return ResultUtil.ok(tfCustomFlowService.updateById(tfCustomFlow));
     }