Merge branch 'test' into 'master'

罗元桥

2021-08-15 239df6b32472882b4bd74fe97d9cc589c4f39baf

 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;

}