Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpMaintenanceReminderDetailVo.java

@@ -24,7 +24,7 @@
    @ApiModelProperty(value = "国药准字号")
    private String quasiNumber;

    @ApiModelProperty("商品标识码")
    @ApiModelProperty("商品条码")
    @TableField("goods_id_code")
    private String goodsIdCode;