获取商品逻辑
sql
提交商品
备份sql
Merge branch 'master' of https://github.com/jiayanchang/thai-master.git

Conflicts:
	thai-crm-master/src/main/java/com/magic/thai/db/dao/GoodsDao.java
	thai-crm-master/src/main/java/com/magic/thai/db/dao/impl/GoodsDaoImpl.java
	thai-crm-master/src/main/java/com/magic/thai/db/domain/Goods.java
	thai-crm-master/src/main/java/com/magic/thai/db/domain/GoodsDetails.java
	thai-crm-master/src/main/java/com/magic/thai/db/service/GoodsService.java
	thai-crm-master/src/main/java/com/magic/thai/db/service/InterfaceOrderService.java
	thai-crm-master/src/main/java/com/magic/thai/db/service/impl/GoodsServiceImpl.java
	thai-crm-master/src/main/java/com/magic/thai/db/service/impl/InterfaceOrderServiceImpl.java