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

Helius

2021-04-12 0df561aa2c21423f1d4bd78040c4c3507b89e259

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