Merge branch 'dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -121,14 +121,17 @@ public class Material extends BaseAPS {
 
     @Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="最小库存数量")
+    @FieldAnnotation(property = false)
     private Double minStockCount;
 
     @Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="安全库存数量")
+    @FieldAnnotation(property = false)
     private Double safeStockCount;
 
     @Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="最大库存数量")
+    @FieldAnnotation(property = false)
     private Double maxStockCount;
 
     @Column(name="ORDER_BATCH_PERIOD")