Browse Source

合并冲突

zou_ht 8 years ago
parent
commit
3dccefa974

+ 1 - 1
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -22,7 +22,7 @@ public interface CustomerMapper {
 	/**
 	 * 修改客户信息
 	 */
-	int updateCustomerByPrimaryKey(Customer record);
+	int updateCustomerByPrimaryKey(String id);
 
 	/**
 	 * 新增

+ 5 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -45,5 +45,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		if(!result.equals("")) result = result.substring(0, result.length()-1);
 		return result;
 	}
+
+	@Override
+	public void updCustomerByByPrimaryKey(String id) {
+		customerMapper.updateCustomerByPrimaryKey(id);
+	}
 	
 }