Merge branch 'hemenkou_dev' into dev

101captain

2022-03-14 0965590521cd58e6fcc8d2ac97f4fa6b01e3e67e

 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;