Merge branch 'liurong-base' into ywn-1121-business

Conflicts:
	src/main/java/com/saituo/order/dao/user/AddressDao.java
	src/main/java/com/saituo/order/dao/user/ProductOrderDao.java
	src/main/java/com/saituo/order/entity/user/Address.java
	src/main/java/com/saituo/order/entity/user/UserOrder.java
	src/main/java/com/saituo/order/service/user/AddressService.java
	src/main/java/com/saituo/order/service/user/UserOrderService.java
	src/main/resources/mapper/user/address-mapper.xml
	src/main/resources/mapper/user/audit_his-mapper.xml
	src/main/resources/mapper/user/product_order-mapper.xml
	src/main/resources/mapper/user/product_order_his-mapper.xml
	src/main/resources/mapper/user/user_group_point_account-mapper.xml
	src/main/resources/mapper/user/user_group_point_his-mapper.xml
	src/main/resources/mapper/user/user_order-mapper.xml
	src/main/resources/mapper/user/user_peas_his-mapper.xml