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

935090232@qq.com

2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4

 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;