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

alien-entity/src/main/resources/mapper/LawyerUserMapper.xml

@@ -115,7 +115,7 @@
         user.delete_flag,
         user.created_time,
         user.is_recommended,
-        firm.firm_name AS firmName,
+        user.law_firm AS firmName,
         firmTwo.payment_account AS paymentNum,
         firmTwo.address AS address,
         GROUP_CONCAT(DISTINCT a.name SEPARATOR ',') AS scenarioNames,