Merge remote-tracking branch 'origin/master' into song-dev

ghjg-item-datashare-server/src/main/resources/mapper/CommonMapper.xml

@@ -84,7 +84,7 @@
                           t2.CANCELLATIONDATE                                                                     cancellationDate,
                           ss.ECONOMIC_TYPE,
                           ss.BUSINESS_SCOPE,
-                          row_number() over (partition by infoall.cname ORDER BY infoall.EFFECTIVESTARTDATE desc) rn
+--                           row_number() over (partition by infoall.cname ORDER BY infoall.EFFECTIVESTARTDATE desc) rn
           from GHJG_BASICS.Vw_Cret_Info_Self_All infoall
                  left join GHJG_BASICS.TOBJ_ENTERPRISE_BASIC t2 on infoall.cname = t2.cnname
                  left join GHJG_PORT_MANAGE.SY_INSPECT ss