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

base-module/src/main/java/com/caimei/module/base/entity/po/Product.java

@@ -617,5 +617,10 @@ public class Product implements Serializable {
      */
     private String auditReason;
 
+    /**
+     * 商品属性：1产品，2仪器
+     */
+    private String commodityType;
+
     private static final long serialVersionUID = 1L;
 }

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -140,7 +140,7 @@
                 order by sellNumber desc
             </when>
             <otherwise>
-                order by onlineTime desc
+                order by productID desc
             </otherwise>
         </choose>
     </select>