Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-09 e3ccb13fdd386d41ea2f721924861f6bb64e6708

 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) {