新增：更新商户ID

优化：oss新增merchantId字段

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -244,5 +244,10 @@ public class UserParam extends BaseParam {
     private Long merchantId;
 
     @ApiModelProperty(value = "商户名称")
+    @QueryField(type = QueryType.EQ)
     private String merchantName;
+
+    @ApiModelProperty(value = "商户LOGO")
+    @QueryField(type = QueryType.EQ)
+    private String merchantAvatar;
 }