Merge branch 'master' into stage-4

pages2/class/questionBank.vue

@@ -603,7 +603,7 @@ export default {
 				if (self.goodsDetail.goodsPhotoExamConfig) {
 					let goodsPhotoExamConfig = JSON.parse(self.goodsDetail.goodsPhotoExamConfig);
 					if (goodsPhotoExamConfig.photograph > 0) {
-						// self.needPhoto = true;
+						self.needPhoto = true;
 					}
 				}