Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2023-06-24 32e2c1f5097f36fe37ea2969f6337d24f55576f4

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

@@ -5,6 +5,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.Date;


/**查询用户详情数据*/
@Data
@@ -37,6 +39,9 @@
    private Integer isHaveShop;
    /**是否有顾问*/
    private Integer isHaveCorp;
    /*开单平台，来源应用appId*/
    private String appId;

    private Date startTime;

    private Date endTime;

}

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

@@ -295,4 +295,10 @@
     * */
    @PostMapping(value = "/user/first/day/consumption")
    Result firstDayConsumption(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/accumulat/consumption")
    Result accumulateConsumption(@RequestBody UserDto userDto);
}