Merge branch 'develop_station' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -277,7 +277,9 @@ public class EquipmentDetailController extends AbstractBaseController {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
-        equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        if (!ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())) {
+            equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        }
         equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         // TODO 后续判断成功，执行同步
         // 编辑同步redis装备iotcode数据