Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafetyTask.java

@@ -94,6 +94,7 @@ public class CoreSafetyTask extends BaseEntity {
      * 0待检查,1检查完成
      */
     @ApiModelProperty(value = "0待检查,1检查完成")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer status;
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -719,7 +719,7 @@
         group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.batch_id
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
-        select t.scan_method, n.area_name, n.collection_area_name, n.img
+        select t.scan_method, n.area_name, n.collection_area_name, t.img,t.submit_time as execute_time
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
         where t.task_id = #{taskId}