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

cjl

2023-10-25 04051af6a3115d73dab6935d06ebd70334484962

 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;