Skip to content

Y
yichengstreet-be
Commit 8b2a37ca authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev'

parents 79d14845 78528524
Pipeline #143950 failed with stages
      in 28 minutes and 27 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 3 additions and 1 deletion
      ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePage.java
      View file @ 8b2a37ca
      ...@@ -97,4 +97,6 @@ public class HouseResourcePage { ...@@ -97,4 +97,6 @@ public class HouseResourcePage {
      private String remark; private String remark;
      private List<String> businessEntityInfoNames; private List<String> businessEntityInfoNames;
      private BigDecimal income;
      } }
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 8b2a37ca
      ...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
      SELECT SELECT
      t2.wg_name AS wgName4, t2.wg_name AS wgName4,
      t1.*, t1.*,
      t4.year_sell SUM(t4.year_sell) AS income
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment