Commit 0ce07456 authored by LiuLin's avatar LiuLin

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 022b0ea8 9d6d62e6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="queryForDataList" <select id="queryForDataList"
resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel"> resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
SELECT SELECT
tzjia.* tzjia.*,
cdd1.NAME AS inspectionClassify, cdd1.NAME AS inspectionClassify,
cdd3.NAME AS inspectionType, cdd3.NAME AS inspectionType,
cdd.NAME AS equipClassify, cdd.NAME AS equipClassify,
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel"> <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
SELECT SELECT
tzjia.* tzjia.*,
cdd1.NAME AS inspectionClassify, cdd1.NAME AS inspectionClassify,
cdd3.NAME AS inspectionType, cdd3.NAME AS inspectionType,
cdd.NAME AS equipClassify, cdd.NAME AS equipClassify,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment