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

huanghongfa

2021-08-15 4ca86cb13b25ece24a323300294b0507926b37a2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java

@@ -43,4 +43,7 @@
    @ApiModelProperty("操作人")
    private String operationUserName;

    @ApiModelProperty("交易备注")
    private String remark;

}