Merge branch 'master' into master-test

wangrenhuang

2023-10-20 c58d0d485ae2394fe80e7f903247fc5ad282cd57

Merge branch 'master' into master-test

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

@@ -9,6 +9,5 @@
 **/
@Data
public class DConsumablesDto extends DCommonDto {


    private Integer type;
}

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

@@ -28,10 +28,19 @@
public interface SUserVisitService {

    /**
     * 查询用户列表
     * 查询用户是否有到访
     * */
    @PostMapping(value = "/user/check")
    Result check(@RequestBody UserDto userDto);



    @PostMapping(value = "/user/query/visitCount")
    Result queryVisitCount(UserDto userDto);

    @PostMapping(value = "/user/query/lastVisit")
    Result queryLastVisit(UserDto userDto);



}