Merge branch 'master' into hotfix_erp_addMobile_1218

@@ -25,7 +25,7 @@
     select 
     count(id)
     from seller_wallet_detail
-    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (32,33)
+    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (31,32,33)
   </select>
 
  

@@ -64,7 +64,7 @@
 
                      new ClipboardJS('#addressCopy', {
                          text: function() {
-                             return address;
+                             return name + '\r\n' + mobile + '\r\n' +  address;
                          }
                      });
                  }

@@ -64,7 +64,7 @@
 
                      new ClipboardJS('#rejectAddressCopy', {
                          text: function() {
-                             return address;
+                             return name + '\r\n' + mobile + '\r\n' +  address;
                          }
                      });
                  }