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

admin

2020-07-01 e91ab3c0e8513ea917a655010e518b5508afea3d

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudService.java

@@ -91,7 +91,7 @@
    * 定时发送云发单

    * @param id

    */

   public void fixedTimeSend(List<GoodsEvaluate> listActivity, List<GoodsEvaluate> listGoods);

   public void fixedTimeSend(List<GoodsEvaluate> listActivity, List<GoodsEvaluate> listGoods, boolean timeLimit);



   public List<UserCloud> query(int page, int count, String key, Integer state);