Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-09-04 e9bafe1d922962c689e4fb0d8da3170a16d1c171

Merge branch 'master' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java

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

@@ -45,6 +45,8 @@
    private String originSubject;
    /**来源平台*/
    private String originChannel;
    /**平台code*/
    private String appIdCode;
    /**关联标识*/
    private String commonId;
}