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

xiaoyong931011

2021-04-20 c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9

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