Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

 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;