Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 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;
   
   /**
    * 收益说明