Merge remote-tracking branch 'cs/master'

assistMg/src/main/resources/mapper/CostProjectMemoMapper.xml

@@ -115,7 +115,7 @@
 
             <if test=" dataScope != null and  dataScope != ''">
                 <if test=" dataScope ==1">
-                    and cpa.area_code like concat ('%',substring({ cityCode},1,4), '%')
+                    and cpa.area_code like concat ('%',substring(#{ cityCode},1,4), '%')
                 </if>
                 <if test=" dataScope ==2">
                     and cpa.area_code=#{ countyCode}