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

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -160,7 +160,7 @@
     <select id="exportTest" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
         SELECT
         r.orderID,
-        u.userName,
+        IF(u.userIdentity = 2,u.name,u.userName) AS userName,
         d.receiptDate,
         d.payType,
         IFNULL(r.associateAmount,0) as associateAmount,