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

pom.xml

@@ -96,13 +96,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

src/main/java/com/uas/ps/inquiry/controller/InquiryForBuyerController.java

@@ -89,9 +89,9 @@ public class InquiryForBuyerController {
         }
         pageInfo.setSort(sort);
         if (null != searchFilter.getUserUU()) {
-            pageInfo.filter("userUU", searchFilter.getUserUU());
+            pageInfo.filter("recorderUU", searchFilter.getUserUU());
         } else if (null != searchFilter.getEnUU()) {
-            pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
+            pageInfo.filter("enUU", searchFilter.getEnUU());
         } else {
             throw new IllegalAccessError("非法访问");
         }

src/main/java/com/uas/ps/inquiry/entity/BatchInProduct.java

@@ -50,7 +50,7 @@ public class BatchInProduct {
     /**
      * 联系人姓名
      */
-    private String bip_buyername;
+    private String em_name;
 
     public Long getBip_id() {
         return bip_id;
@@ -116,11 +116,11 @@ public class BatchInProduct {
         this.bip_mobile = bip_mobile;
     }
 
-    public String getBip_buyername() {
-        return bip_buyername;
+    public String getEm_name() {
+        return em_name;
     }
 
-    public void setBip_buyername(String bip_buyername) {
-        this.bip_buyername = bip_buyername;
+    public void setEm_name(String em_name) {
+        this.em_name = em_name;
     }
 }

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -277,7 +277,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setSource("ERP");
                             item.setSourceid(batch.getBip_id());
                             item.setCurrency(batch.getBip_currency());
-                            item.setUserName(batch.getBip_buyername());
+                            item.setUserName(batch.getEm_name());
                             item.setUserTel(batch.getBip_mobile());
                             item.setUserCode(batch.getBip_buyercode());
                             item.setOfferAmount(0);