Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java

@@ -220,4 +220,34 @@ public class UserPo {
 
     @ApiModelProperty(name = "制单员nc编码")
     private String documentPreparerNcCode;
+
+    @ApiModelProperty("法人代表")
+    private String legalRepresentative;
+
+    @ApiModelProperty("统一编码")
+    private String unifiedCode;
+
+    @ApiModelProperty("注册电话")
+    private String registeredPhone;
+
+    @ApiModelProperty("注册地址")
+    private String registeredAddress;
+
+    @ApiModelProperty("传真")
+    private String fax;
+
+    @ApiModelProperty("付款银行")
+    private String paymentBank;
+
+    @ApiModelProperty("付款账户")
+    private String paymentAccount;
+
+    @ApiModelProperty("发票抬头")
+    private String invoiceTitle;
+
+    @ApiModelProperty("税号")
+    private String taxNumber;
+
+    @ApiModelProperty("备注")
+    private String remark;
 }