Merge branch 'dev-1.6.3' of depot-qinghai/depot-business-qinghai into dev

src/main/java/com/chinaitop/depot/grainReserves/model/GopsPlanObject.java

@@ -50,28 +50,28 @@ public class GopsPlanObject {
     private Integer warehouseId;
 
     @ApiModelProperty(value = "货位名称", position = 6)
-    private Integer warehouseName;
+    private String warehouseName;
 
     /** 粮食品种；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食品种id", position = 7)
     private Integer grainVarietyId;
 
     @ApiModelProperty(value = "粮食品种名称", position = 8)
-    private Integer grainVarietyName;
+    private String grainVarietyName;
 
     /** 粮食性质；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食性质id", position = 9)
     private Integer grainNatureId;
 
     @ApiModelProperty(value = "粮食性质名称", position = 10)
-    private Integer grainNatureName;
+    private String grainNatureName;
 
     /** 粮食等级；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食等级id", position = 11)
     private Integer grainGradeId;
 
     @ApiModelProperty(value = "粮食等级名称", position = 12)
-    private Integer grainGradeName;
+    private String grainGradeName;
 
     /** 计划数量 */
     @ApiModelProperty(value = "计划数量", position = 13)