a
a
a
Merge branch 'master' of https://github.com/hjra/may5.git

Conflicts:
	CShop/.classpath
	CShop/Proj2Work/CShop/target/m2e-wtp/web-resources/.gitignore
	CShop/src/main/java/net/may5/controller/ManagerController.java
	CShop/src/main/java/net/may5/controller/QnAController.java
	CShop/src/main/java/net/may5/dao/QnAMapper.java
	CShop/src/main/java/net/may5/dao/QnAMapper.xml
	CShop/src/main/java/net/may5/service/QnAService.java
	CShop/src/main/java/net/may5/service/QnAServiceImpl.java
	CShop/src/main/webapp/WEB-INF/views/cst/membership/board.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/membership/boardCheck.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/membership/boardEdit.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/membership/boardWriteForm.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/membership/list.json
	CShop/src/main/webapp/WEB-INF/views/cst/order/advanceOrder.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/order/advanceOrderPayment.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/order/payment.jsp
	CShop/src/main/webapp/WEB-INF/views/mng/cstInfo/managerEditQnA.jsp
	CShop/src/main/webapp/WEB-INF/views/mng/cstInfo/managerQnA.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/log4j.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/CustomerMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/EvaluationMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/ItemMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/ManagerMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/QnAMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/net/may5/dao/SttMapper.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/jdbc.properties
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/spring/appServlet/servlet-context.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/spring/root-context.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates/defaultLayout.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates/footer.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates/layout.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates/mngHeader.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles2-defs/templates/mngLayout.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/ajaxView.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/allMemberInfoJsonForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/delivery/dlvImage.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/home/homeImage.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/board.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/boardCheck.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/boardEdit.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/boardUpdateForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/boardWriteForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/calendar.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/deleteMemberInfoForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/deleteMemberOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/deleteMemberVerifyForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/joinForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/joinOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/list.json
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/loginForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/loginOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/modifyInfoForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/myPage.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/scIdOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/scInfoForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/scPasswordForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/scPasswordModifyForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/scPasswordModifyOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/membership/termsForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/menu/menuInfo.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/menu/menuInfoCommonView.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/advanceOrder.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/advanceOrderPayment.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderDetail.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderDtSearch.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderList.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderNdetail.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderReceiverInfo.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderSearch.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/orderTemp.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/payment.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/cst/order/qrcode.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/allMemberInfoForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/blackListForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/managerBoardWrite.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/managerEditQnA.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/managerQnA.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/cstInfo/vipListForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/deliveryMng/dlvNotice.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/deliveryMng/dlvPresent.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/deliveryMng/dlvmImage.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/loginMng/loginForm.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/loginMng/loginOk.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/manager/managerEdit.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/manager/managerInfo.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/menuMng/menuInfoMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/menuMng/menuInsertMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/menuMng/menuListMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/menuMng/menuModifyMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/menuMng/menuStockMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/orderInfoMng/orderListMng.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/statistics/dailyReport.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/statistics/memberReport.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/statistics/menuReport.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/statistics/orderReport.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/views/mng/statistics/salesReport.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/WEB-INF/web.xml
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/index.jsp
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/admin-layout.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/bootstrap-theme.min.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/bootstrap.min.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/dlvNotice.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/footer.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/homeimage.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/jRating.jquery.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/membership.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/nody.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/orderDetail.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/orderList.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/orderNotice.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/css/style.css
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/fonts/glyphicons-halflings-regular.svg
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/admin.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/bootstrap.min.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/html5shiv.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jRating.jquery.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jRating.jquery.min.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jquery.actual.min.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jquery.inputmask.min.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jquery.ui.datepicker-ko.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/jquery.validate.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/moment.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/table_array.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/js/web.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/advanceOrder.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/blackCstInfo.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/cstInfo.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/membership.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/mngInfo.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/orderListInfo.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/tableSetting.js
	CShop/target/CShop-1.0.0-BUILD-SNAPSHOT/resources/script/vipCstInfo.js
	CShop/target/classes/net/may5/dao/CustomerMapper.xml
	CShop/target/classes/net/may5/dao/EvaluationMapper.xml
	CShop/target/classes/net/may5/dao/ItemMapper.xml
	CShop/target/classes/net/may5/dao/ManagerMapper.xml
	CShop/target/classes/net/may5/dao/QnAMapper.xml
	CShop/target/classes/net/may5/dao/SttMapper.xml
	CShop/target/m2e-wtp/web-resources/META-INF/maven/net.may5/CShop/pom.properties
	CShop/target/maven-archiver/pom.properties