Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java

@@ -56,6 +56,10 @@
    public GoodsorderService goodsorderService;

    @Autowired
    public ShopService shopService;


    @Autowired
    public GoodsorderDetailService goodsorderDetailService;

    @Autowired
@@ -74,8 +78,6 @@
    @Autowired
    public ArticleService articleService;

    @Autowired
    public ShopService shopService;

    @Autowired
    public ShopNewsService shopNewsService;