Merge remote-tracking branch 'origin/jialian' into jialian

lishihai

2024-06-19 8fcc8d68d295ed80a42c4862f0591cd187df38b7

 models/material.go

@@ -96,6 +96,7 @@
      MinInventoryRule decimal.Decimal `json:"minInventoryRule" gorm:"-"` //最小库存
      MaxInventoryRule decimal.Decimal `json:"maxInventoryRule" gorm:"-"` //最大库存

      CreateBy string `gorm:"type:varchar(255);comment:导入人、创建人" json:"createBy"` //创建人
   }

   MaterialSearch struct {