Merge branch 'master-prod-new' into master-test

fwq

2023-07-12 0d820b2125e80c510e55ec85766092fab11ba5e1

Merge branch 'master-prod-new' into master-test

 phis-feign/src/main/java/com/hz/his/dto/PageDto.java

@@ -3,6 +3,8 @@

import lombok.Data;

import java.util.List;

/**
 * @author ChenJiaHe
 * 分页扩展类*/
@@ -20,7 +22,7 @@
    private String parentId;
    /**分类标识*/
    private String typeId;

    private List<String> typeIdList;
    //appid
    private String appId;


 phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java

@@ -27,4 +27,11 @@
     */
    @PostMapping(value = "/channels/list")
    Result getChannelsList(@RequestBody PageDto pageDto);

    /**
     * 获取渠道列表-渠道大类
     * @return Result
     */
    @PostMapping(value = "/channels/type/list")
    Result getChannelsListByType(@RequestBody PageDto pageDto);
}