Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/poll/PollNew.js

public/react/src/modules/courses/poll/PollNew.js

@@ -280,9 +280,13 @@ class PollNew extends Component {
 					questionnair: true,
 					left_banner_id:result.data.left_banner_id
 				})
-				// console.log(this.state.polls_nametest)
+				if( result.data.poll.polls_name){
-				// console.log(this.state.polls_descriptiontest)
+					if( result.data.poll.polls_name.length>0){
-				// }
+						this.setState({
+							addonAfter: result.data.poll.polls_name.length,
+						})
+					}
+				}
 			}).catch((error) => {
 				console.log(error)
 			})
@@ -326,8 +330,13 @@ class PollNew extends Component {
 					polls_descriptiontest: result.data.poll.polls_description,
 					questionnair: true,
 				})
-
+			if( result.data.poll.polls_name){
-			// }
+				if( result.data.poll.polls_name.length>0){
+					this.setState({
+						addonAfter: result.data.poll.polls_name.length,
+					})
+				}
+			}
 		}).catch((error) => {
 			console.log(error)
 		})