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

jiangyouyao

2022-04-06 143acd2312a766f39c75b82bce5a32412b863825

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java

@@ -33,7 +33,7 @@
    * 用户id
    */
   @ApiModelProperty(hidden = true)
   private String  userId;
   private Long  userId;
   
   /**
    * 收益说明