Merge branch 'score_shop' into api_score_meger

jyy

2021-07-15 a43e210f39562bbbdc25f75ec3aaad94ae33dfbf

 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;