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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

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

@@ -70,4 +70,16 @@
    */

   public List<UserCloudOrder> getLasthourByUnpaid();



   /**

    * 查询

    * @param page

    * @param count

    * @param key

    * @param state

    * @return

    */

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



   long count(String key, Integer state);



}