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

fwq

2022-12-12 58d2e3646fe5b911e2d3110679b4ece5f38cad16

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

@@ -2,7 +2,7 @@

import lombok.Data;

/**用户拥有查询实体*/
/**查询实体*/
@Data
public class UserHaveDto {
    /**phis用户标识*/