Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/CrmAnalyseMapper.xml

@@ -205,7 +205,7 @@
 
     <select id="crmDetail" resultType="com.qmth.sop.business.bean.result.TBCrmResult">
         SELECT
-        distinct a.id crmId,a.crm_no as crmNo,
+        distinct a.id as crmId,a.crm_no as crmNo,
         a.begin_time  as beginTime,
         a.name,
         tbs.id,