From 81f1800f402bf974409081affdf999a376dd7de3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 26 Nov 2023 19:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=20dameng=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/dm/flowable-6.8.md                        | 28 -------------------
 .../bpm/dal/dataobject/oa/BpmOALeaveDO.java   | 11 ++++----
 2 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 sql/dm/flowable-6.8.md

diff --git a/sql/dm/flowable-6.8.md b/sql/dm/flowable-6.8.md
deleted file mode 100644
index 6619d7e6c..000000000
--- a/sql/dm/flowable-6.8.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# 达梦 flowable 适配
-
-参考文档: [《Flowable6.8(6.x 版本通用)整合集成达梦 8 数据库(DM8)详解，解决自动生成表时 dmn 相关表语法报错问题》](https://blog.csdn.net/TangBoBoa/article/details/130392495)
-
-## 1. 覆盖 flowable，liquibase 相关代码
-
-把`flowable-patch/src`下的文件按文件结果添加到`yudao-server`或者`yudao-module-bpm-biz`项目对应目录中，甚至你可以做个独立模块。
-
-## 2. 修改相关 DAO
-
-例如`cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO`
-
-```diff
-- @TableField("`type`")
-private String type;
-```
-
-## 3. 关于`flowable.database-schema-update`配置
-
-首次运行，修改`flowable.database-schema-update=true`，系统会自动建表，第二次运行需要修改为`false`。
-
-## 4. TODO
-
-配置`flowable.database-schema-update=true`第二次运行失败，报错
-
-```text
-Object [FLW_EV_DATABASECHANGELOG] already exists
-```
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
index e4fbc1dea..4e4e68d6f 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
 
-import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
-import lombok.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
 
 /**
  * OA 请假申请 DO
@@ -37,7 +39,6 @@ public class BpmOALeaveDO extends BaseDO {
     /**
      * 请假类型
      */
-    @TableField("`type`")
     private String type;
     /**
      * 原因