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

jinpengyong

2023-11-01 87172c08a55e972ff850ab3542858d11d66505ca

 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;