Merge branch 'dev'

xiangpei

4 天以前 e85cd3fe826efe0baaa3fc09ea371467127c370c

 flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java

@@ -52,6 +52,9 @@
    @ApiModelProperty("json转换后的对象")
    private Object eventDataObj;

    @ApiModelProperty("内容")
    private String content;

    public static ProcessLogVO getVoByEntity(@NonNull ProcessLog entity, ProcessLogVO vo) {
        if(vo == null) {
            vo = new ProcessLogVO();