This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 9d81c5da9ff5c9719f81ae84a1e581f8c31138b4 Merge: 0081ce0 069e9f9 Author: lenboo <[email protected]> AuthorDate: Fri Feb 12 08:49:48 2021 +0800 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit .../service/impl/ProcessDefinitionServiceImpl.java | 4 ++ .../api/service/impl/ProjectServiceImpl.java | 2 +- .../dolphinscheduler/dao/entity/ProjectUser.java | 33 ++++++--- .../dolphinscheduler/dao/mapper/ProjectMapper.java | 15 ++++- .../dolphinscheduler/dao/mapper/ProjectMapper.xml | 26 +++++++- .../dao/mapper/ProjectUserMapper.xml | 2 +- .../service/process/ProcessService.java | 78 +++++++++++++--------- .../service/process/ProcessServiceTest.java | 2 +- sql/dolphinscheduler_mysql.sql | 2 +- 9 files changed, 115 insertions(+), 49 deletions(-)
