modified:   1/wp-content/plugins/woocommerce/includes/class-wc-form-handler.php
Merge branch 'master' of https://github.com/glayyiyi/cms

Conflicts:
	1/wp-content/plugins/woocommerce/includes/class-wc-form-handler.php
	1/wp-content/plugins/woocommerce/includes/wc-gz-functions.php
	modified:   1/wp-content/plugins/woocommerce/includes/class-wc-form-handler.php