Merge remote-tracking branch 'origin/dev' into feature/ysCha

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -404,7 +404,7 @@
                 ON PE.ITEM_ID = I.ITEM_ID
             WHERE P.OBJECT_NO = #{objectNo}
                 AND P.PLAN_NO = #{planNo}
-            AND I.POWER_COM_FLG = '1'  /* PCS 아이템만 */
+--             AND I.POWER_COM_FLG = '1'  /* PCS 아이템만 */
         ) T
     </select>