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

fwq

2022-12-05 0e8bc2d98c293528e1fd5f98d197a8cef371a7e3

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

@@ -251,5 +251,11 @@
    /*同步领建的参数*/
    private boolean internal;

    //修改操作人名称
    private String opMan;

    //修改操作人标识
    private String opId;


}