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

xiaoyong931011

2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d

 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;