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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java

@@ -16,6 +16,11 @@
    * 主键
    */
   private Long  id;
   @ApiModelProperty(value ="活动今日是否已参与 1:未参与 2：已参与")
    private int joinState;

   public static final int JOINSTATE_NOTSIGN = 1;
   public static final int JOINSTATE_SIGN = 2;
   
   @ApiModelProperty(value ="活动名称")
    private String actName;