Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2022-01-24 4915156f5e5b321a48eba19746bbcc740f34a881

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