Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-11 9df95cfc0f6109d0cc04657d26a2c9af033950d9

 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;