Merge branch 'dev1'

Administrator

2018-12-06 1770eb0a01b3f2ef92f416b67d25160d3ced9625

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java

@@ -21,6 +21,16 @@
    * @throws CommonGoodsException

    */

   public CommonGoods addOrUpdateCommonGoods(CommonGoods commonGoods) throws CommonGoodsException;

	
	
   /**

    * 添加商品（无就添加，有则返回）

    * 
    * @param commonGoods

    * @return

    * @throws CommonGoodsException

    */

   public CommonGoods addCommonGoods(CommonGoods commonGoods) throws CommonGoodsException;



   /**

    * 更新商品信息