Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 829392f5e6ff4492fb40769d2ea09552a07aa2ad

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -134,11 +134,7 @@
            return ResultData.error("事件名称不能为空");
        }

        String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
        if(!StringUtils.isEmpty(id))
        {
            return ResultData.error("事件名称已存在");
        }


        return toAjax(iTransactionEventService.updateConfig(entity));
    }
@@ -242,4 +238,5 @@

    }


}