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

95b2dec9 · 胡佳晨 · 19d88009 · 017811b3 · 95b2dec9
Commit 95b2dec9 authored Dec 06, 2021 by 胡佳晨
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sqlmap.properties ...ervice-merchant-impl/src/main/resources/sqlmap.properties +1 -1

No files found.
--- a/liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties
+++ b/liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties
 #  ---------------------------------------------------------------------------------------------------------------------
-merchant_fields.update_claim_status_and_uid=UPDATE merchant_fields SET claim_status = ?, updated_at = ? WHERE field_id = ?
+merchant_fields.update_claim_status_and_uid=UPDATE merchant_fields SET claim_status = ?, uid = ?, updated_at = ? WHERE field_id = ?
 merchant_fields.update_is_check=UPDATE merchant_fields SET is_check = ?, updated_at = ? WHERE field_id = ?
 merchant_fields.update_base_info=UPDATE merchant_fields SET name = ?, logo = ?, background = ?, description = ?, built_date = ?, province_id = ?, province_name = ?, city_id = ?, city_name = ?, district_id = ?, district_name = ?, address = ?, longitude = ?, latitude = ?, contact_name = ?, contact_email = ?, updated_at = ? WHERE field_id = ?
 #  ---------------------------------------------------------------------------------------------------------------------