Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da

 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;