Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

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

@@ -39,7 +39,6 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "资金密码")
    private String password;