Merge branch 'master' of http://101.36.160.140:21044/crk-java-qinghai/armyfoodSrcQh

src/main/resources/mapper/cplbusiness/DataCrkywCplspDefaultMapper.xml

@@ -46,11 +46,14 @@
                 a.sjjlspmcbh as "sjjlspmcbh",
                 a.isEnable as "isEnable",
                a.scpc as "scpc",
-               a.sccs as "sccs"
+               a.sccs as "sccs",
+               a.cjsj as "cjsj",
+               e.enumName as "djmc"
         FROM  data_crkyw_cplsp_default a
         LEFT JOIN  basic_enum b on a.sjjlppbh = b.enumId
         LEFT JOIN  basic_enum c on a.sjjlpzbh = c.enumId
         LEFT JOIN  basic_enum d on a.jldw = d.enumId
+        LEFT JOIN  basic_enum e on a.dj = e.enumId
         <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
             where  ${ew.sqlSegment}
         </if>