Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

Helius

2021-03-17 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf

 zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java

@@ -54,7 +54,11 @@
    }

    public String getIsFree() {
        return isFree;
        if ("1".equals(isFree)) {
            return "是";
        } else {
            return "否";
        }
    }

    public void setIsFree(String isFree) {