Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/entity/ItdmSampleInventory.java

@@ -59,6 +59,8 @@ public class ItdmSampleInventory implements Serializable {
 	/**样品分类*/
 	@Excel(name = "样品分类", width = 15)
     @ApiModelProperty(value = "样品分类")
+    @Dict(dicCode = "id",dictTable = "itdm_sample_classification",dicText = "name")
+
     private String sampleClassifications;
 	/**样品单位*/
 	@Excel(name = "样品单位", width = 15)