Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-27 f86b4032c5824c4e69821ce9b795e8a7c236c799

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

@@ -104,6 +104,9 @@
     */
    private String isDelete;


    private String openId;

    @TableField(exist = false)
    private Integer unitCode;