Deleted files manually
Merge remote-tracking branch 'origin/master'

Conflicts:
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ArticleCategoryT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ArticleT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/AuthorityT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/BrandT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/CartT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/CouponT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/DeliverAddressT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ElectronicMenuCartT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ElectronicMenuOrderT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ExpresstempleteT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/FavoriteT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/FunctionM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GlobalParamM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsAttributeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsCategoryT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsCommentT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsSpecificationsRelationshipT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsTypeBrandT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsTypeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsTypeTN.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsstarCommentT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GoodsunitT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/GradeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ImgT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ImgTypeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/InvoicePrintT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/InvoicePrintingT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/InvoicetempleteT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/JshopbasicInfoT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/KeywordT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/LocationT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/LogisticsBusinessT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/LogisticsbusinessareaT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ModuleM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/MsgtextT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/NoticeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/OrderInvoiceT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/OrderT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/PageEditareaT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/PageT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/PaymentM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/PlaceoforiginT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ProductSpecificationsT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ProductT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/RoleFunctionM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/RoleM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/RoleT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/SerialT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/ShippingAddressT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/SiteNavigationT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/SystemMailM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/TableT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/TaobaoUserT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/TemplateT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/TemplatesetT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/TemplatethemeT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/UserRoleM.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/UserT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/VouchersT.hbm.xml
	ROOT/WebContent/WEB-INF/classes/com/jshop/entity/WebsiteMsgT.hbm.xml
add updatetime version ,articleT articleCategoryT Action
add modified in relateproductid  add function in GoodsTNACTION