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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

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

@@ -8,11 +8,11 @@
@ApiModel(value = "LoadParamSettingBasicDto", description = "查询参数")
public class LoadParamSettingBasicDto {
   
   @ApiModelProperty(value ="会员OPENID")
   private String userId;
   @ApiModelProperty(value ="会员ID")
   private Long userId;

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