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

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

 ard-work/src/main/java/com/ruoyi/utils/result/Results.java

@@ -12,7 +12,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class Results {
    private String code;
    private Integer code;
    private String msg;
    private Object data;