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

gongchunyi

昨天 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 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;
}