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

cjl

2023-11-10 0920f23406e52e4c7149515797a317c836c9e065

 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;