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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

 screen-manage/src/main/java/com/moral/api/entity/ManageCoordinateDetail.java

@@ -56,6 +56,9 @@
    private  String updayeUserName;


    private String state;


    @TableField(exist = false)
    private  String code;