Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

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

@@ -13,11 +13,11 @@
   @ApiModelProperty(value ="会员姓名")
   private String userName;
   
   @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;