Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 bb6248de48262d75d5cb62c9f18c87f5cf72f538

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

@@ -164,7 +164,7 @@
        Assert.notNull(Id, "Id 不能为空");
        int i = iTransactionEventService.deleteConfigById(Id);
        if (i>0)
           return toAjax(iTransactionEventService.deleteConfigById(Id));
           return  ResultData.success("删除成功");
        else
          return  ResultData.error("删除失败可能该工单有单据");
    }