Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-16 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c

 gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java

@@ -5,7 +5,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;

@Data
@@ -36,6 +38,7 @@
    @ApiModelProperty(value="类型")
    private Long itemType;

    @Transient
    @ApiModelProperty(value = "单位")
    private String itemUnit;
    private transient String itemUnit;
}