Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java

@@ -67,6 +67,12 @@
    @ApiModelProperty("理由")
    private String reason;

    /**
     * 领取图片
     */
    @ApiModelProperty("领取图片")
    private String receiveUrl;

    @ApiModelProperty("类型 1 content 2其他")
    private Integer type;