Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -46,7 +46,7 @@
           and si.id = #{id}
     </select>
     <select id="selectMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
-        SELECT si.*，sc.name AS classifyName FROM sup_indicators AS  si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        SELECT si.*,sc.name AS classifyName FROM sup_indicators AS  si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
          WHERE si.is_deleted = 0 and si.create_user = #{params.userId} AND sc.is_deleted = 0
         <if test="params.assessDept != null and params.assessDept != ''" >
             and si.assess_dept = #{params.assessDept}