Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-18 40401d1a6f2eb27a666b33579a60970141563e25

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

@@ -39,7 +39,7 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "Name",required = false) String Name,
                                          @RequestParam(value = "name",required = false) String Name,
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);