Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 829392f5e6ff4492fb40769d2ea09552a07aa2ad

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

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



        return toAjax(iTransactionEventService.updateConfig(entity));
    }