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

rk

3 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 server/services/src/main/java/com/doumee/service/business/LocksService.java

@@ -2,6 +2,7 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;

import javax.servlet.http.HttpServletResponse;
@@ -107,4 +108,10 @@
    long count(Locks locks);

    void exportImages(String siteid, HttpServletResponse response);

    Bikes findBikeBase(String bikeId,Integer force);

    List<Bikes> findAllBikeBase(Integer fouce);

    void exportEbikeImages(String bikeid, HttpServletResponse response);
}