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

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java

@@ -19,7 +19,7 @@
{
    private static final long serialVersionUID = 1L;

    List<TreeSelectWell> wellList;
    List<TreeDeptWell> wellList;
    int count0;
    int count1;
    int count2;