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

jyy

2021-01-12 34dba42b4d215398ed3215efb3c31a898870ffcf

 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;