增加字段
Merge branch 'master' of https://github.com/pocrd/net.pocrd.api

Conflicts:
	Common.config
	src/net/pocrd/api/resp/ApiProductInfo.java
	src/net/pocrd/dao/ProductDAO.java
	src/net/pocrd/dao/TestDAO.java
	src/net/pocrd/dao/entity/ProductInfo.java
	src/net/pocrd/webapi/product/GetProductList.java