Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java

New file
@@ -0,0 +1,29 @@
package com.matrix.system.fenxiao.dto;

import com.matrix.core.pojo.BasePageQueryDto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "ShopSalesmanDetailDto", description = "查询参数")
public class ShopSalesmanDetailDto extends BasePageQueryDto {
	
   @ApiModelProperty(value ="会员姓名")
   private String userName;
	
   @ApiModelProperty(value ="会员ID")
   private Long userId;

   @ApiModelProperty(value ="申请记录ID")
   private Long applyId;

    @ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
    private Integer orderType;
	
   @ApiModelProperty(hidden = true)
   private Long companyId;

	
}