Merge branch 'master' of http://114.244.114.158:8802/siwei/sanya-data-management-back

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/ZymlServiceImpl.java

@@ -223,6 +223,7 @@ public class ZymlServiceImpl implements IZymlService {
                 c.setLegend(cur.getLegend());
                 c.setFwmc(cur.getFwmc());
                 c.setFwys(cur.getFwys());
+                c.setFwgzkj(cur.getFwgzkj());
                 treedata.add(c);
             }
             return RequestResult.success("成功", treedata);

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/yzt/ZymlMapper.xml

@@ -158,6 +158,7 @@
           t.ywlx as "ywlx",
           t.fwmc AS "fwmc",
           t.fwys AS "fwys",
+          t.fwgzkj AS "fwgzkj",
         #{username} as "my",
           null as "fzbsm",
           to_char(res.datetime ,'yyyy-MM-dd hh24:mi:ss') as "datetime",

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/yzt/ZymlMapper.xml

@@ -230,6 +230,7 @@
           t.ywlx as "ywlx",
           t.fwmc AS "fwmc",
           t.fwys AS "fwys",
+          t.fwgzkj AS "fwgzkj",
         #{username} as "my",
         #{username} as "favorite"
        from T_YZT_ZYML t