feat:解决合并代码后的冲突

src/modules/store-manage/EmployeeAddOrEditModal.tsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-27 16:21:49
  * @Date: 2020-11-27 16:21:49
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-09 10:52:52
+ * @LastEditTime: 2021-08-09 13:47:18
  * @Description: Description
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -329,25 +329,6 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
             <div className="avatart-img">
             <div className="avatart-img">
               <img className="avatar" src={avatar}></img>
               <img className="avatar" src={avatar}></img>
             </div>
             </div>
-            <div className="upload-avatar">
-              <Button id="click_upload_btn" onClick={_onUpload}>
-                上传头像
-              </Button>
-              <input
-                type="file"
-                accept="image/*"
-                id="CrpperAvatarPic"
-                style={{ display: "none" }}
-                onChange={_handleUpdateAvatar}
-              />
-              {cropperModalVisible && (
-                <CropperModal
-                  imgUrl={imgUrl}
-                  save={changeAvatar}
-                  close={closeCropperModal}
-                />
-              )}
-            </div>
           </div>
           </div>
         </Col>
         </Col>
       </Row>
       </Row>