Merge remote-tracking branch 'origin/develop_dl_3.7.2.2' into develop_dl_3.7.2.2

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java

@@ -106,10 +106,11 @@ public class Car extends BaseEntity {
 	@ApiModelProperty(value = "队伍名称(冗余字段来源于平台)")
 	private String teamName;
 
-
+	@ApiModelProperty(value = "状态")
+	@TableField("equip_status")
+	private String equipStatus ="0";
 
 	//新加
-
 	@ApiModelProperty(value = "机构/部门名称")
 	@TableField("biz_org_name")
 	private String bizOrgName;

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

@@ -364,6 +364,10 @@ public class CarController extends AbstractBaseController {
 				car.setBizOrgName(map.get("companyName"));
 			}
 		}
+		// 由于前端不展示码状态此处解决异常二维码更新之后变正常问题
+		Car tempCar = iCarService.selectOneById(car.getId());
+		car.setEquipStatus(tempCar.getEquipStatus());
+
 		Car car1 = iCarService.updateOneById(car);
 		CarController controllerProxy = SpringUtils.getBean(CarController.class);
 		controllerProxy.refreshAllCount();