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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

 src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java

@@ -1,8 +1,12 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.pojo.SupplierManage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class SupplierManageDto extends SupplierManage {

    @ApiModelProperty(value = "维护人员名称")
    private String maintainUserName;
}