Merge branch 'api' into score_shop

Helius

2021-04-08 4eda876fabd7478e337041d7b9c7db771678fac5

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