Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/views/jgEmploye/index.php

@@ -682,6 +682,9 @@
                 $('#edit_sex').html(row.sex == 0 ?'男':'女');
                 $('#address1').val(row.address[0]);
                 $('#address2').val(row.address[1]);
+                $('#edit_desc').val(row.des);
+
+
                 $('#cart_num').val(row.cart_num);
                 $('#star').val(row.star);
                 $('#readme').val(row.readme);
@@ -715,6 +718,7 @@
                 $('#skill').children().each(function (index, element) {
                     $(this).find('input').prop('checked', false);
                 });
+              $('#edit_desc').val('');
                 $('#edit_sex').html('');
                 $('#address1').val('');
                 $('#address2').val('');