Merge remote-tracking branch 'origin/master'

rk

14 小时以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java

@@ -103,7 +103,7 @@
     * @param shopNews 实体对象
     * @return long
     */
    Integer count(ShopNews shopNews);
    long count(ShopNews shopNews);


    /**