Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-10 f4495e2587c0ba7c2085d3db0cbaca0d3fa30489

 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;