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

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbmerchantAccount.java

@@ -45,6 +45,8 @@ public class TbmerchantAccount implements Serializable {
 
     private String headImg;
 
+    private String pwd;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -214,4 +216,12 @@ public class TbmerchantAccount implements Serializable {
     public void setHeadImg(String headImg) {
         this.headImg = headImg == null ? null : headImg.trim();
     }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
 }