Merge remote-tracking branch 'origin/master-basefun' into master-jiayan-test

chenjiahe

2024-08-21 6c516609258b917b348329f21690b304cf8cf255

Merge remote-tracking branch 'origin/master-basefun' into master-jiayan-test

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

@@ -32,6 +32,7 @@
     * @param file 文件
     * @param folderCode 存储文件夹,比如商品轮播图:/goods/banner
     * @param bucketName 存储桶名称
     * @param fileName 文件名称（含后缀）,如：test.xml
     * @return
     */
    @RequestMapping(value = "/cos/upload-multipart/name",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)

 phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java

@@ -455,8 +455,13 @@
    private String mainChannelName;
    /**执行部位*/
    private String deductionBodyPartInfo;
    /**导出版本*/
    private String exportVersion = EXPORT_VERSION_V1;


    /**导出版本-v1*/
    public static final String EXPORT_VERSION_V1 = "v1";
    /**导出版本-v2*/
    public static final String EXPORT_VERSION_V2 = "v2";

    public Integer getPageNum() {
        if(pageNum == null){
@@ -479,4 +484,8 @@
    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }




}