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

jyy

2021-03-17 0f66a8dc0544e72b0d41adfc69db20ea584c4661

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