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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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;