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

jyy

2021-03-16 72396cbbb60d0418dd4cb63f310532fc70a28c10

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

@@ -17,7 +17,15 @@
   @Extend
   private static final long serialVersionUID = 1L; 

	
   /**
    * 推广收益类型    推广收益
    */
    public static final String TYPE_TGSY = "推广收益";
    /**
     * 推广收益类型   邀请收益
     */
   
    public static final String TYPE_YQSY = "邀请收益";