x# WARNING: head commit changed in the meantime

x

src/main/java/com/egolm/shop/service/impl/UserServiceImpl.java

@@ -433,7 +433,7 @@ public class UserServiceImpl implements UserService {
 		String memo = (String)parameters.get("memo"); 
 		
 		
-		jdbcTemplate.update("update tCustomer set sCustomerName = ? where sCustNO = ?", customerName, custNo);
+		jdbcTemplate.update("update tCustomer set sCustName = ? where sCustNO = ?", customerName, custNo);
 		jdbcTemplate.update("update tShop set sShopName = ?, sProvinceID = ?, sCityID = ?, sDistrictID = ?, sAddress = ?, sEmail = ?, sMemo = ? where nShopID = ?", shopName, provinceId, cityId, districtId, address, email, memo, shopId);
 		int count = jdbcTemplate.queryForInt("select count(*) from tShopCertif where sShopNO = ? and sCertifTypeID = ? and sCertifNO = ?", new Object[] {shopNo, certifTypeID, certifNO});
 		if(count == 0) {