Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

 screen-api/src/main/java/com/moral/api/entity/Device.java

@@ -136,10 +136,7 @@
    @TableField(exist = false)
    private Version version;

    @Override
    protected Serializable pkVal() {
        return this.id;
    }



}