diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index d9a286b..e79d1fb 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -143,9 +143,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
     }
 
     @Override
-    public TmTask getLeaseOutOrder(String parentId,String typeId) {
+    public TmTask getLeaseOutOrder(String parentId, String typeId) {
         TmTask orderHead = leaseApplyDetailsMapper.getOrderHead(parentId);
-        List<LeaseOutDetailRecord> list = leaseApplyDetailsMapper.getOrderBody(parentId,typeId);
+        List<LeaseOutDetailRecord> list = leaseApplyDetailsMapper.getOrderBody(parentId, typeId);
         orderHead.setLeaseOutDetailRecord(list);
         return orderHead;
     }
@@ -254,22 +254,24 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
                 }
                 // 更新 (ma_machine 设备表)的状态
                 leaseOutDetailsMapper.updateMaMachineStatus(record);
-                //同步租赁商城机具状态
-                try {
-                    MaMachine maMachine = new MaMachine();
-                    maMachine.setMaId(record.getMaId());
-                    // 15---1在库，16---2已出库
-                    maMachine.setMaStatus("2");
-                    String content = JSONObject.toJSONString(maMachine);
-                    Map<String, String> map = new HashMap<>();
-                    map.put("body", content);
-                    String body = JSONObject.toJSONString(map);
-                    String data = HttpHelper.sendHttpPost(updateItemStatus, body);
-                    log.info("dataString-=========:" + data);
+                //查询装备是否推送到租赁
+                MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId()));
+                if (maMachine != null && maMachine.getPushStatus().equals(1)) {
+                    //同步租赁商城机具状态
+                    try {
+                        // 15---1在库，16---2已出库
+                        maMachine.setMaStatus("2");
+                        String content = JSONObject.toJSONString(maMachine);
+                        Map<String, String> map = new HashMap<>();
+                        map.put("body", content);
+                        String body = JSONObject.toJSONString(map);
+                        String data = HttpHelper.sendHttpPost(updateItemStatus, body);
+                        log.info("dataString-=========:" + data);
                     } catch (Exception e) {
                         log.error("同步租赁商城机具状态失败");
                         throw new RuntimeException("同步租赁商城机具状态失败");
                     }
+                }
             }
         }
         return res;
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
index a2ef4d3..124be2e 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -15,12 +15,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.1.2:8848
-        namespace: sgzb_cloud_dev_cqjj
+        server-addr: 172.16.36.33:8848
+        namespace: sgzb_cloud_dev
+        username: nacos
+        password: N2$NjW2&CDEOx$mD*y5h
       config:
         # 配置中心地址
-        server-addr: 192.168.1.2:8848
-        namespace: sgzb_cloud_dev_cqjj
+        server-addr: 172.16.36.33:8848
+        namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -37,8 +39,8 @@ sgzb:
   job:
     settlementJobDay: 21
     settlementJobCron: "0 0 1 21 * ?"
-  zlptUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications
-  updateItemStatusUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/updateItemStatus
-  intelligentUrl: https://www.zhgkxt.com/api/clientapi/public/externalApi
+  zlptUrl: https://z.csgmall.com.cn/proxy/item-center/supply/item/pushNotifications
+  updateItemStatusUrl: https://z.csgmall.com.cn/proxy/item-center/supply/item/updateItemStatus
+  intelligentUrl: https://www.zhgkxt.com/api/clientapi/public/externalApi/acceptExternalMechanical
   intelligentAppKey: abc123
   intelligentAesKey: abcdefghijklmnop
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
index 4c1a216..e74803e 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -290,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
                m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
                m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
-               dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId
+               dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId,m.push_status
         from ma_machine m
          left join ma_type mt on m.type_id = mt.type_id
          left join ma_type mt1 on mt.parent_id = mt1.type_id