diff --git a/tcm/src/main/resources/application-green.yml b/tcm/src/main/resources/application-green.yml index 287cc757..8f683a2a 100644 --- a/tcm/src/main/resources/application-green.yml +++ b/tcm/src/main/resources/application-green.yml @@ -36,8 +36,8 @@ eureka: ip-address: 49.232.6.143 file: path: /home/cloud/tcm/uploads/ - domain: https://www.sxwikionline.com/gateway/tcm/ - imgDomain: https://www.sxwikionline.com/gateway/tcm/uploads/ + domain: http://sxzxyzzlm.tall.wiki/gateway/tcm/ + imgDomain: http://sxzxyzzlm.tall.wiki/gateway/tcm/uploads/ day: one: 9 two: 30 diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml index c4d93f35..7d68c55b 100644 --- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml +++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml @@ -96,12 +96,14 @@ + + @@ -116,14 +118,15 @@ c1.sort as fSort, c1.remark as fRemark, c1.report_type as fReportType, - c1.record_type as recordType, + c1.record_type as fRecordType, c2.id as sId, c2.code as sCode, c2.`name` as sName, c2.must as sMust, c2.sort as sSort, c2.remark as sRemark, - c2.report_type as sReportType + c2.report_type as sReportType, + c2.record_type as sRecordType FROM t_report_code c1 LEFT JOIN (