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

admin

2019-11-14 8870f82f07541e27dc6b94b310070625ff9cc6ff

 fanli/src/main/java/com/yeshi/fanli/service/inter/elme/ElmeOrderService.java

@@ -16,4 +16,7 @@
    * @param order

    */

   public void addOrder(ElmeOrder order) throws ElmeOrderException;



   public ElmeOrder selectByPrimaryKey(Long id);



}