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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorAuth.java

@@ -108,5 +108,7 @@
    private String orderNo;
    @TableField(value = "orderStatus")
    private String orderStatus;
    @TableField(value = "qrCode")
    private String qrCode;

}