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

# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java

@@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
 	@Column(name = "ref_sn")
 	@ApiParam(value = "关联二维码")
-	private String refSN;
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String refSN;
 
 }