修改bug

liujie

2 天以前 0d173aa09530bbdfc72d4c6e0bfb81317aebac78

修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java

@@ -225,7 +225,7 @@
            return R.fail("该订单已发货");
        }
        exchange1.setStatus(2);
        exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
        exchange1.setLogisticsNumber(exchange.getLogisticsNumber());
        sysGoodsExchangeService.updateById(exchange1);
        return R.ok();
    }

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java

@@ -118,8 +118,8 @@

    @ApiModelProperty(value = "是否为处方药 1=是 2=否")
    @TableField("is_prescription_drug")
    @Excel(name = "是否为处方药",replace = {"是_1","否_2"})
    private Integer isPrescriptionDrug;
    @Excel(name = "是否为处方药",replace = {"是_1","否_2","_3"})
    private Integer isPrescriptionDrug=3;

    @Excel(name = "包装单位")
    @TableField(exist = false)