Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 c60eea0ab4d74ab8f39a33f896e978dc591f1800

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

@@ -1,12 +1,12 @@
package com.panzhihua.common.model.vos.community.warehouse;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @title: ComActWarehouseOperationVO
@@ -21,10 +21,10 @@
public class ComActWarehouseOperationVO {

    @ApiModelProperty(value = "操作记录id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;

    @ApiModelProperty(value = "操作内容")
    private String content;
@@ -34,7 +34,7 @@
    private Date createTime;

    @ApiModelProperty(value = "操作人")
    private Integer userId;
    private Long userId;

    @ApiModelProperty("申请人姓名")
    private String applyName;