Merge remote-tracking branch 'remotes/origin/dev'

4 years ago · 842bdacd33
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
@ -38,7 +38,7 @@
        hc.CONFIGURATION_DESCRIPTION,
        chd.REGION,
        chd.CONFIGURATION,
-        chd.DEMO_DATA,
+        hc.DEMO_DATA,
        chd.DISPLAY_ORDER
    FROM
        (