Merge remote-tracking branch 'origin/master'

xuhy

昨天 206fcf7d6afae27856f63cf0158f53b61fa1b86f

 ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java

@@ -42,12 +42,8 @@
    @Excel(width = 30,name = "最低采购单位")
    private String lowUnitName;

    @Excel(width = 30,name = "是否为处方药",replace = {"1_是","2_否"})
    @Excel(width = 30,name = "是否为处方药")
    private String isPrescriptionDrug;

    @ApiModelProperty(value = "商品规格")
    @TableField("goods_spec")
    private String goodsSpec;


    @Excel(width = 30,name = "*预警库存")