Commit 5ce87ed5 authored by tianyiming's avatar tianyiming

Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

# Conflicts: # amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
parents 587a3ebf 0bd02a5e
......@@ -179,4 +179,7 @@ public class EquipmentSpecificIndex extends BaseEntity {
// 直流中心方便前端刷新展示
@TableField(exist = false)
private String UUID;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment