Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -52,7 +52,7 @@
   </select>
   <select id="selectDetail" resultMap="qwe" parameterType="java.util.Map">
       SELECT
-      FROM_UNIXTIME(start_time/1000,'%y-%m-%d') as startDate,
+      FROM_UNIXTIME(start_time/1000,'%Y-%m-%d') as startDate,
       if(a.aa = 1,p.`name`,null) as projectName,
       if(a.aa = 0,p.`name`,null) as projectNamep,
       if(a.aa = 1,c.start_time,null) as start_time,
@@ -64,11 +64,11 @@
       `t_compete_project_config` c
       LEFT JOIN t_compete_project p on c.project_id = p.id
       LEFT JOIN (
-      SELECT
+          SELECT
-      id,
+          id,
-      if(FROM_UNIXTIME(start_time/1000,'%h') &lt;= 12,1 ,0) as aa
+          if(FROM_UNIXTIME(start_time/1000,'%h') &lt;= 12,1 ,0) as aa
-      FROM
+          FROM
-      t_compete_project_config
+          t_compete_project_config
       )a on c.id = a.id
       where c.project_id = p.id
       ORDER BY c.start_time