Merge remote-tracking branch 'origin/score_shop' into developer

姜友瑶

2022-05-17 830b2eb4e8b7eef6e73fe65cde5331d914c28786

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