Merge branch 'ty_fix' into alpha

Helius

2021-11-08 9d1fa7183a25cbef2c6de82fd1f75da4f2353173

 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;