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

src/main/resources/mapper/SecondHandMapper.xml

@@ -111,7 +111,7 @@
             cshd.productDetails,
             cshd.productQuality,
             cshd.secondHandType,
-            cshd.instrumentType,
+            ifnull(cshd.instrumentType,0) as instrumentType,
             cshd.showContactFlag,
             cshd.contactMobile,
             cshd.contactName,