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

Helius

2021-10-25 b5f0c1c0ccc1def1b611abd2bc70403137c74722

 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java

@@ -12,7 +12,9 @@
    * 主键
    */
   private Long  id;
			
   //活动类型
   private int  actType;

   @ApiModelProperty(value = "用户")
   private String nickName;