‘linchangsheng’ il y a 9 mois
Parent
commit
e8856c34e2

+ 1 - 15
mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -104,21 +104,7 @@ public class OrderBaseVO {
     @ApiModelProperty("销售订单号")
     private String saleOrderId;
 
-    @ZfireField(sortNum = 22,tbName = "b")
-    @ApiModelProperty("产品品牌")
-    private String brandName;
-    @ZfireField(sortNum = 23,tbName = "b")
-    @ApiModelProperty("产品大类")
-    private String mainName;
-    @ZfireField(sortNum = 24,tbName = "b")
-    @ApiModelProperty("产品小类")
-    private String smallName;
-    @ZfireField(sortNum = 25,tbName = "b")
-    @ApiModelProperty("产品机型")
-    private String productName;
-    @ZfireField(sortNum = 26,tbName = "b")
-    @ApiModelProperty("产品数量")
-    private String num;
+
 
     @ZfireField(sortNum = 27)
     @ApiModelProperty("工程编号")

+ 1 - 1
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -280,7 +280,7 @@
     <select id="orderBaseList" resultType="com.gree.mall.manager.bean.listvo.workorder.OrderBaseVO">
         select
           ${ex.selected}
-        from pg_order_base a join pg_order_product b on a.id=b.order_base_id
+        from pg_order_base a
           ${ex.query}
           <if test="ex.orderSmallType != null and ex.orderSmallType !=''">
               and a.order_small_type = #{ex.orderSmallType}