Merge branch 'developer_repair_contact20200408' into 'developer'

Developer repair contact20200408

See merge request !43

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -126,6 +126,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                 ServiceResponse response = this.departmentApiService.add(departmentDTO);
                 GicClerkDTO gicClerkDTO = dto.getGicClerkDTO();
                 if(gicClerkDTO != null){
+                	gicClerkDTO.setPostionName("店长");
                 	staffApiService.addGicClerk(gicClerkDTO);
                 }
                 log.info("添加结果：{}", JSON.toJSONString(response));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -696,6 +696,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    	//修改
 	    	}else{
 	    		staff.setHeadImg(headPic);
+	    		staff.setSex(sex);
 	    		//staff.setPostion(postion);
 //	    		staff.setStaffName(staffName);
 	    		if(staff.getActiveFlag() != null && staff.getActiveFlag() != 1){