Merge remote-tracking branch 'origin/master'

ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerAddressController.java

@@ -131,6 +131,7 @@ public class CustomerAddressController extends BaseController {
     @PostMapping("/update")
     @ResponseBody
     AjaxResult updateCustomerAddress(@RequestBody CustomerAddress customerAddress){
+        logger.info("地址库的订单修改方法{}",customerAddress);
         try {
             // 判断下当前是否是默认地址
             if(ObjectUtil.equals(customerAddress.getIsDefault(), 1)){

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -1590,6 +1590,7 @@ public class OrderMasterController extends BaseController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult editServingInfo(@RequestBody OrderMaster request) {
+        logger.info("另一处修改地址库的方法{}",request);
         try {
             // 更新期望时间
             orderMasterService.updateOrderMaster(request);