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

Pu Zhibing

3 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java

@@ -65,8 +65,10 @@
        recommendCooperation.setCreateTime(new Date());
        if(recommendCooperation.getShopId()!=null){
            recommendCooperation.setRecommendedFrom(2);
            recommendCooperation.setMemberSource("合作商推荐");
        }else{
            recommendCooperation.setRecommendedFrom(1);
            recommendCooperation.setMemberSource("小程序");
        }
        this.save(recommendCooperation);
    }