diff --git a/njzscloud-localizer-svr/pom.xml b/njzscloud-localizer-svr/pom.xml index 063388a..262f5c8 100644 --- a/njzscloud-localizer-svr/pom.xml +++ b/njzscloud-localizer-svr/pom.xml @@ -12,6 +12,7 @@ UTF-8 + localizer @@ -32,7 +33,7 @@ - localizer + ${appname} org.apache.maven.plugins diff --git a/njzscloud-localizer-svr/src/main/resources/logback-spring.xml b/njzscloud-localizer-svr/src/main/resources/logback-spring.xml index af71b14..82642ac 100644 --- a/njzscloud-localizer-svr/src/main/resources/logback-spring.xml +++ b/njzscloud-localizer-svr/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ - + diff --git a/njzscloud-svr/pom.xml b/njzscloud-svr/pom.xml index bc63821..5c3b19f 100644 --- a/njzscloud-svr/pom.xml +++ b/njzscloud-svr/pom.xml @@ -14,6 +14,7 @@ 8 8 UTF-8 + greenfrog @@ -105,7 +106,7 @@ - greenfrog + ${appname} org.apache.maven.plugins diff --git a/njzscloud-svr/src/main/resources/logback-spring.xml b/njzscloud-svr/src/main/resources/logback-spring.xml index af71b14..82642ac 100644 --- a/njzscloud-svr/src/main/resources/logback-spring.xml +++ b/njzscloud-svr/src/main/resources/logback-spring.xml @@ -3,7 +3,7 @@ - + diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index ea017f6..582938b 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -160,6 +160,7 @@ LEFT JOIN biz_company m ON m.id = a.station_id AND m.station = 1 LEFT JOIN sys_user n ON n.id = a.qu_audit_user_id LEFT JOIN sys_user o ON o.id = a.shi_audit_user_id + LEFT JOIN sys_dict_item p ON p.dict_key = 'vehicle_type' AND p.val = e.truck_category UPDATE biz_driver