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

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -120,6 +120,8 @@ public class InsOrdersController extends BaseController {
             InsAreaCompanyHistoryVo insAreaCompanyHistoryVo = new InsAreaCompanyHistoryVo();
             BeanUtils.copyProperties(a, insAreaCompanyHistoryVo);
             insAreaCompanyHistoryVo.setLicenseno(insOrders.getLicenseno());
+            insAreaCompanyHistoryVo.setUserName(insOrders.getUsername());
+            insAreaCompanyHistoryVo.setUserId(insOrders.getUserid());
             return insAreaCompanyHistoryVo;
         }).collect(Collectors.toList());
 

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -276,6 +276,17 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "score")
     private String score;
 
+    /**
+     * 业务员
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 业务员ID
+     */
+    @TableField(exist = false)
+    private String userId;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;