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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -46,4 +46,7 @@
    @ApiModelProperty("交易备注")
    private String remark;

    @ApiModelProperty("交易业务id")
    private Long serviceId;

}